[FFmpeg-cvslog] Merge commit 'a0a90b1a1116250a2494021da810cc5da89ea36f' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 02:27:34 2014 +0200| [c437ab3c4ea2578e68e39e4bf32dda2ff6a1ed07] | committer: Michael Niedermayer

Merge commit 'a0a90b1a1116250a2494021da810cc5da89ea36f' into release/0.10

* commit 'a0a90b1a1116250a2494021da810cc5da89ea36f':
  tiffdec: use bytestream2 to simplify overread/overwrite protection

Conflicts:
	libavcodec/tiff.c

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

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