virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

tiff: Return proper error for missing LZMA compression

Browse Source 
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>
This commit is contained in:
Diego Elio Pettenò
2014-08-18 09:27:49 +01:00
committed by Luca Barbato
parent dd35d451fb
commit 12640e4cbb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/tiff.c
View File

@@ -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);

3
libavcodec/tiff.h
View File

@@ -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 {