Merge commit '9bd4561d74a46dd6557140e286228e09e380674c' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 22:25:27 +0000 (23:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 22:25:41 +0000 (23:25 +0100)
commit0295615f0a01583301e5a19b6a6c9d490ba36085
tree50ae478b773e107d96698774e1fe8b4b371ce62a
parentc69fff3790aed5e5c17ba6c36978a3b8e16a0298
parent9bd4561d74a46dd6557140e286228e09e380674c
Merge commit '9bd4561d74a46dd6557140e286228e09e380674c' into release/2.4

* commit '9bd4561d74a46dd6557140e286228e09e380674c':
  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