Browse Source

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>
tags/n2.4
Diego Elio Pettenò Luca Barbato 10 years ago
parent
commit
12640e4cbb
2 changed files with 5 additions and 1 deletions
  1. +3
    -0
      libavcodec/tiff.c
  2. +2
    -1
      libavcodec/tiff.h

+ 3
- 0
libavcodec/tiff.c View File

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


+ 2
- 1
libavcodec/tiff.h View File

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


Loading…
Cancel
Save