ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Tue Aug 5 04:04:01 2014 +0200| [9ed1aa0465b3377dec860bcfe8144533b9ea9d68] | committer: Michael Niedermayer
Merge commit '744b406ff3474e77543bcf86125a2f7bc7deaa18' into release/2.2 * commit '744b406ff3474e77543bcf86125a2f7bc7deaa18': huffyuv: Check and propagate function return values Conflicts: libavcodec/huffyuvdec.c See: f67a0d115254461649470452058fa3c28c0df294 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ed1aa0465b3377dec860bcfe8144533b9ea9d68 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog