-
Michael Niedermayer authored
* commit '3a3790b8': tiff: support encoding and decoding 64bit images Conflicts: libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/version.h See: c714cd3bMerged-by: Michael Niedermayer <michaelni@gmx.at>
9aabe667
* commit '3a3790b8': tiff: support encoding and decoding 64bit images Conflicts: libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/version.h See: c714cd3bMerged-by: Michael Niedermayer <michaelni@gmx.at>