diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-13 16:11:23 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-13 16:33:36 +0200 |
commit | dd1b4ed6d98f1f4dd566a28ec5ade00712f9c27c (patch) | |
tree | c54184b83bf5bdcc76a0d45356d10195e82e0492 | |
parent | 38025e6898ef7caa076ff20daf4fc9f27269e4df (diff) | |
download | ffmpeg-dd1b4ed6d98f1f4dd566a28ec5ade00712f9c27c.tar.gz |
avcodec/tiff: Support uncompressed G4 CCITT fax
Fixes part of ticket700
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/tiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index d5584a5636..55ec0ac07e 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -460,7 +460,7 @@ static int tiff_unpack_fax(TiffContext *s, uint8_t *dst, int stride, "Error allocating temporary buffer\n"); return AVERROR(ENOMEM); } - if (s->fax_opts & 2) { + if ((s->fax_opts & 2) && s->compr == TIFF_G3) { avpriv_request_sample(s->avctx, "Uncompressed fax mode"); av_free(src2); return AVERROR_PATCHWELCOME; |