ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Aug 6
00:07:08 2014 +0200| [296b01d7f91f8d595269f1137f37d4b9671bfafa] | committer:
Michael Niedermayer
Merge commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb'
* commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb':
huffyuvdec: check width size for yuv422p
Conflicts:
libavcodec/huffyuvdec.c
See: 6abb9a901fca27da14d4fffbb01948288b5da3ba
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=296b01d7f91f8d595269f1137f37d4b9671bfafa
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
