[FFmpeg-cvslog] Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'
Michael Niedermayer
git at videolan.org
Fri Jul 11 13:06:08 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 11 12:41:57 2014 +0200| [4c91599484e115e9b51c884fc46cea3f8511f8ae] | committer: Michael Niedermayer
Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'
* commit 'f90729699db9ede2bef2b28000f1795dab1b8996':
mov: Do not group tracks if more than one is enabled per type
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c91599484e115e9b51c884fc46cea3f8511f8ae
---
More information about the ffmpeg-cvslog
mailing list