diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 13:58:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 13:58:10 +0200 |
| commit | a53a107a2f04a3f4311bd2e34f3d1aa10cc4570e (patch) | |
| tree | b49225d7afa2b4310033106d11c5b1d4a9a3a9dc /ffserver.c | |
| parent | 2e2e6b1be5913f64830cae1538696601c61c80d0 (diff) | |
| parent | 0897d2fdc7755849c3ae58d8b543ef734c200d3c (diff) | |
| download | ffmpeg-a53a107a2f04a3f4311bd2e34f3d1aa10cc4570e.tar.gz | |
Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'
* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c':
movenc: Add option to disable nero chapters
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions