From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 21 Aug 2013 08:45:23 +0000 (+0200)
Subject: Merge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8d63aaed1efe58d951c312bad01d38277518fa36;p=ffmpeg

Merge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'

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

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

8d63aaed1efe58d951c312bad01d38277518fa36