ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Fri Aug
8 14:38:20 2014 +0200| [451bc8ee2fceaf9a3290ed5a6c65b6734ab51b8c] | committer:
Michael Niedermayer
Merge commit '43d676432740c6d5e5234ed343f13902909fd124' into release/1.1
* commit '43d676432740c6d5e5234ed343f13902909fd124':
huffyuv: Check and propagate function return values
Conflicts:
libavcodec/huffyuvdec.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=451bc8ee2fceaf9a3290ed5a6c65b6734ab51b8c
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
