tiff: Return proper error for missing LZMA compression

The LZMA support is a semi-official extension supported by libtiff 4.0.0
and later.

Signed-off-by: Diego Elio Pettenò <[email protected]>
Signed-off-by: Luca Barbato <[email protected]>
This commit is contained in:
Diego Elio Pettenò authored and Luca Barbato committed 2014-08-18 14:23:24 +02:00
1 parent dd35d451fb
commit 12640e4cbb
2 files changed
+5 -1

No files matched your search

+3
View File
@@ -408,6 +408,9 @@ static int tiff_decode_tag(TiffContext *s)
case TIFF_NEWJPEG:
avpriv_report_missing_feature(s->avctx, "JPEG compression");
return AVERROR_PATCHWELCOME;
case TIFF_LZMA:
avpriv_report_missing_feature(s->avctx, "LZMA compression");
return AVERROR_PATCHWELCOME;
default:
av_log(s->avctx, AV_LOG_ERROR, "Unknown compression method %i\n",
s->compr);
+2 -1
View File
@@ -71,7 +71,8 @@ enum TiffCompr {
TIFF_NEWJPEG,
TIFF_ADOBE_DEFLATE,
TIFF_PACKBITS = 0x8005,
TIFF_DEFLATE = 0x80B2
TIFF_DEFLATE = 0x80B2,
TIFF_LZMA = 0x886D,
};
enum TiffTypes {