diff options
| author | Diego Elio Pettenò <flameeyes@flameeyes.eu> | 2014-08-18 09:27:49 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-08-18 14:23:24 +0200 |
| commit | 12640e4cbb142be0cd025bcf37f1ea437bdfecd0 (patch) | |
| tree | 97f004eddad13f89ff95926e448251299f3b83e7 | |
| parent | dd35d451fbc34795a8d19ac6c281bed53c42a29b (diff) | |
| download | ffmpeg-12640e4cbb142be0cd025bcf37f1ea437bdfecd0.tar.gz | |
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ò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/tiff.c | 3 | ||||
| -rw-r--r-- | libavcodec/tiff.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index ca5ec75e7b..3b2fc7d900 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -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); diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h index 8a3f7f75eb..68ac695937 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -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 { |