[FFmpeg-cvslog] Merge commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d' into release/0.10
Michael Niedermayer
git at videolan.org
Tue Aug 12 20:35:24 CEST 2014
ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 12 20:28:37 2014 +0200| [497d66126242a94c32c146434e543ee2833e6349] | committer: Michael Niedermayer
Merge commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d' into release/0.10
* commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d':
ffv1dec: check that global parameters do not change in version 0/1
Conflicts:
libavcodec/ffv1.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=497d66126242a94c32c146434e543ee2833e6349
---
More information about the ffmpeg-cvslog
mailing list