virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0'

Browse Source 
* commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0':
  tiff: Return proper error for missing LZMA compression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-18 19:51:53 +02:00
commit 3f0c76e262
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/tiff.c
View File

@ -772,6 +772,9 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
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

@ -95,7 +95,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 TiffGeoTagKey { enum TiffGeoTagKey {