Merge commit '3c27275c1309190f2d6ed69140b67d014215b6c9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 21:00:32 +0000 (22:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 21:00:52 +0000 (22:00 +0100)
commit07b4d4b1a282d1968e0977bc34ed303ea26b1246
treedc25f9b24bff4cb033ba5aac13f1cb44dca62a1c
parent41915d0b86c60a46c1dc8151672770b7cddbe18f
parent3c27275c1309190f2d6ed69140b67d014215b6c9
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 <michaelni@gmx.at>
libavcodec/tiffenc.c