Commit 12640e4c authored by Diego Elio Pettenò's avatar Diego Elio Pettenò Committed by Luca Barbato

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: 's avatarDiego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent dd35d451
...@@ -408,6 +408,9 @@ static int tiff_decode_tag(TiffContext *s) ...@@ -408,6 +408,9 @@ static int tiff_decode_tag(TiffContext *s)
case TIFF_NEWJPEG: case TIFF_NEWJPEG:
avpriv_report_missing_feature(s->avctx, "JPEG compression"); avpriv_report_missing_feature(s->avctx, "JPEG compression");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
case TIFF_LZMA:
avpriv_report_missing_feature(s->avctx, "LZMA compression");
return AVERROR_PATCHWELCOME;
default: default:
av_log(s->avctx, AV_LOG_ERROR, "Unknown compression method %i\n", av_log(s->avctx, AV_LOG_ERROR, "Unknown compression method %i\n",
s->compr); s->compr);
......
...@@ -71,7 +71,8 @@ enum TiffCompr { ...@@ -71,7 +71,8 @@ enum TiffCompr {
TIFF_NEWJPEG, TIFF_NEWJPEG,
TIFF_ADOBE_DEFLATE, TIFF_ADOBE_DEFLATE,
TIFF_PACKBITS = 0x8005, TIFF_PACKBITS = 0x8005,
TIFF_DEFLATE = 0x80B2 TIFF_DEFLATE = 0x80B2,
TIFF_LZMA = 0x886D,
}; };
enum TiffTypes { enum TiffTypes {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment