diff options
| author | Michael Niedermayer <[email protected]> | 2014-02-14 15:31:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-02-14 15:31:14 +0100 |
| commit | fba1592f35501bff0f28d7885f4128dfc7b82777 (patch) | |
| tree | d24120d4e629ca0f261b21db7774acb8f5dc80d5 /ffserver.c | |
| parent | 71052d85c16bd65fa1e3e01d9040f9a3925efd7a (diff) | |
| parent | 0b9716c45568890dd1ff1b7cc5946c59eb3452e5 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/examples: misc Doxygen markup improvements
Conflicts:
doc/examples/muxing.c
doc/examples/transcode_aac.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions