[FFmpeg-cvslog] Merge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 21 10:45:23 2013 +0200| [8d63aaed1efe58d951c312bad01d38277518fa36] | committer: Michael Niedermayer

Merge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d63aaed1efe58d951c312bad01d38277518fa36
---