mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0'
* commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0': tiff: Return proper error for missing LZMA compression Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3f0c76e262
@ -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);
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user