Merge commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Oct 2014 01:45:36 +0000 (02:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Oct 2014 01:45:36 +0000 (02:45 +0100)
commitbe787bccc00c0da482e99315dd7b155c575aa159
treee248e255ee58a04119cb8d4b190697d8388bd75b
parentad600e10da6beaa057ae16fdb12c94414dd6c20e
parenta9911a1b2df37ca808e06dc30627215f4ec9a9e4
Merge commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4'

* commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4':
  doc: Document the omit_tfhd_offset flag to the mp4 muxer

Conflicts:
doc/muxers.texi

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