[FFmpeg-cvslog] Merge commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4'
Michael Niedermayer
git at videolan.org
Thu Oct 30 03:17:21 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 30 02:45:36 2014 +0100| [be787bccc00c0da482e99315dd7b155c575aa159] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be787bccc00c0da482e99315dd7b155c575aa159
---
More information about the ffmpeg-cvslog
mailing list