[FFmpeg-cvslog] Merge commit '9bd4561d74a46dd6557140e286228e09e380674c' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 17 23:25:27 2015 +0100| [0295615f0a01583301e5a19b6a6c9d490ba36085] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0295615f0a01583301e5a19b6a6c9d490ba36085
---