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)
commit8d63aaed1efe58d951c312bad01d38277518fa36
tree5e8dc540cda58fbd8e02840c9e1668cd7f08b514
parent9ab8de4b23908de3792540605e2c2e30892cc33d
parentdb03cb37fd9650b4a7c752d24a2e84ff27508ee8
Merge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'

* commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8':
  movenc: Allow chapter track in default MODE_MP4

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