diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 19:51:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 19:52:22 +0200 |
| commit | 3f0c76e26205f867b089ac56d7cb14bf8d984ef0 (patch) | |
| tree | 44bda496d6f5fd5d761b98385f3acb1e39bcb67b | |
| parent | f47751a56cc470c90f9761afd510e5a6560340f9 (diff) | |
| parent | 12640e4cbb142be0cd025bcf37f1ea437bdfecd0 (diff) | |
| download | ffmpeg-3f0c76e26205f867b089ac56d7cb14bf8d984ef0.tar.gz | |
Merge commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0'
* commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0':
tiff: Return proper error for missing LZMA compression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 7dab18466c..73bf828a84 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -772,6 +772,9 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) 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 11e9f1629d..3f692afa00 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -95,7 +95,8 @@ enum TiffCompr { TIFF_NEWJPEG, TIFF_ADOBE_DEFLATE, TIFF_PACKBITS = 0x8005, - TIFF_DEFLATE = 0x80B2 + TIFF_DEFLATE = 0x80B2, + TIFF_LZMA = 0x886D, }; enum TiffGeoTagKey { |