-
Michael Niedermayer authored
* commit '9c221697': tiff: do not overread the source buffer Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
d0b27eab
* commit '9c221697': tiff: do not overread the source buffer Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>