mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
a53a107a2f
* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c': movenc: Add option to disable nero chapters Conflicts: doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>