ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Dec 15
22:00:32 2014 +0100| [07b4d4b1a282d1968e0977bc34ed303ea26b1246] | committer:
Michael Niedermayer
Merge commit '3c27275c1309190f2d6ed69140b67d014215b6c9'
* commit '3c27275c1309190f2d6ed69140b67d014215b6c9':
tiff: Check the check_size() return value and forward it
Conflicts:
libavcodec/tiffenc.c
See: d50aa006fb3430bedc3872ba10e028a714499625
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07b4d4b1a282d1968e0977bc34ed303ea26b1246
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
