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 /doc/muxers.texi | |
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 'doc/muxers.texi')
-rw-r--r-- | doc/muxers.texi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 2de6a4ee92..af4afc1b87 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -551,6 +551,11 @@ This operation can take a while, and will not work in various situations such as fragmented output, thus it is not enabled by default. @item -movflags rtphint Add RTP hinting tracks to the output file. +@item -movflags disable_chpl +Disable Nero chapter markers (chpl atom). Normally, both Nero chapters +and a QuickTime chapter track are written to the file. With this option +set, only the QuickTime chapter track will be written. Nero chapters can +cause failures when the file is reprocessed with certain tagging programs. @end table @subsection Example |