[FFmpeg-cvslog] Merge commit '0d61f260010707f3028b818e8b24598e1a83d696'
Michael Niedermayer
git at videolan.org
Thu Sep 12 14:07:04 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 12 13:58:01 2013 +0200| [d6e650d885941282955e4840d4bdd8aa6feb58fd] | committer: Michael Niedermayer
Merge commit '0d61f260010707f3028b818e8b24598e1a83d696'
* commit '0d61f260010707f3028b818e8b24598e1a83d696':
zmbvdec: Check the buffer size for uncompressed data
Conflicts:
libavcodec/zmbv.c
See: 44c23aa1b85d195db6647d24e3b1d3de051790db
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6e650d885941282955e4840d4bdd8aa6feb58fd
---
More information about the ffmpeg-cvslog
mailing list