[FFmpeg-cvslog] Merge commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 15 22:12:40 2014 +0100| [4cffcbc809d24d29b5bc9e913402ea1faf2986a8] | committer: Michael Niedermayer

Merge commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0'

* commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0':
  tiff: set the correct return value when check_size() fails

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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