-
Michael Niedermayer authored
* commit '016c5b06': tiff: refactor fax support in a separate function Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
1fec361f
* commit '016c5b06': tiff: refactor fax support in a separate function Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>