Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 11:58:10 +0000 (13:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 11:58:10 +0000 (13:58 +0200)
commita53a107a2f04a3f4311bd2e34f3d1aa10cc4570e
treeb49225d7afa2b4310033106d11c5b1d4a9a3a9dc
parent2e2e6b1be5913f64830cae1538696601c61c80d0
parent0897d2fdc7755849c3ae58d8b543ef734c200d3c
Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'

* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c':
  movenc: Add option to disable nero chapters

Conflicts:
doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/muxers.texi
libavformat/movenc.c
libavformat/movenc.h