Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 01:01:03 +0000 (03:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 01:20:09 +0000 (03:20 +0200)
commit94cf83ff91b2380e487211a0444bcd4ac9b58b75
tree9f7b191c15551537eb2a446c738116b834bfbfb8
parent31876ea620064b00c41ab87c3bb49cf9c6e098eb
parent0a467a9b594dd67aa96bad687d05f8845b009f18
Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'

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

Conflicts:
libavcodec/tiff.c

See: 1ec83d9a9e472f485897ac92bad9631d551a8c5b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/tiff.c
libavcodec/tiff_common.c