[FFmpeg-cvslog] Merge commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb'
Michael Niedermayer
git at videolan.org
Wed Aug 21 11:05:32 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 21 10:59:02 2013 +0200| [a76390d100ec85f88a7d48ddad476c4a685008f9] | committer: Michael Niedermayer
Merge commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb'
* commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb':
movenc: Allow chapters to be written in trailer
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a76390d100ec85f88a7d48ddad476c4a685008f9
---
More information about the ffmpeg-cvslog
mailing list