Merge commit '85b8b169175a55fc862e01ecc96f649374bc14d2' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 15:06:03 +0000 (17:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 15:06:03 +0000 (17:06 +0200)
commit63b38d4a91818c6aa6e842c9df7f27362b1223fa
treefa474d47316827c74fd9c1301e01b9cca4b10d7a
parent260f37ee4d036f61633ccaf03e5d96f448d723ea
parent85b8b169175a55fc862e01ecc96f649374bc14d2
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@gmx.at>
libavcodec/tiff.c