-
Michael Niedermayer authored
* commit '999ccd2d': tiff: cleanup the error paths Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
dc318505
* commit '999ccd2d': tiff: cleanup the error paths Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>