ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Fri Aug
8 15:19:40 2014 +0200| [91437631d76f8ba966c370df56795bf1cf2045ad] | committer:
Michael Niedermayer
Merge commit 'c53effc41b9359261b17c8da3b7062369cafd686' into release/1.1
* commit 'c53effc41b9359261b17c8da3b7062369cafd686':
huffyuvdec: check width size for yuv422p
Conflicts:
libavcodec/huffyuvdec.c
See: 6abb9a901fca27da14d4fffbb01948288b5da3ba
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91437631d76f8ba966c370df56795bf1cf2045ad
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
