ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sat Aug
23 02:15:54 2014 +0200| [5b1a953960ddb78995c9a784baf910ad3299ecce] | committer:
Michael Niedermayer
Merge commit '8231764784a405f546e9c427a6de22d3f4de5c35' into release/2.2
* commit '8231764784a405f546e9c427a6de22d3f4de5c35':
ffv1dec: check that global parameters do not change in version 0/1
Conflicts:
libavcodec/ffv1dec.c
See: b05cd1ea7e45a836f7f6071a716c38bb30326e0f
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b1a953960ddb78995c9a784baf910ad3299ecce
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
