Merge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 08:45:23 +0000 (10:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 08:45:27 +0000 (10:45 +0200)
* commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8':
  movenc: Allow chapter track in default MODE_MP4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/movenc.c

Simple merge