[FFmpeg-cvslog] Merge commit '85b8b169175a55fc862e01ecc96f649374bc14d2' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 17:06:03 2014 +0200| [63b38d4a91818c6aa6e842c9df7f27362b1223fa] | committer: Michael Niedermayer

Merge commit '85b8b169175a55fc862e01ecc96f649374bc14d2' into release/1.1

* commit '85b8b169175a55fc862e01ecc96f649374bc14d2':
  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=63b38d4a91818c6aa6e842c9df7f27362b1223fa
---