diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-13 17:02:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-13 17:02:05 +0200 |
| commit | 7727f76230e60c9da881a51e53f6d34f249fa2fd (patch) | |
| tree | f701ed75a6be037c468452a8a6cf449e5f711a1e /libavcodec/tiff.c | |
| parent | a4f9bb228bb34f0cfa4b55b207c19604b1e36818 (diff) | |
| download | ffmpeg-7727f76230e60c9da881a51e53f6d34f249fa2fd.tar.gz | |
avcodec/tiff: Support uncompressed G3 CCITT fax
Fixes part of Ticket700
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 55ec0ac07e..d5c6398a17 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -460,11 +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) && s->compr == TIFF_G3) { - avpriv_request_sample(s->avctx, "Uncompressed fax mode"); - av_free(src2); - return AVERROR_PATCHWELCOME; - } + if (!s->fill_order) { memcpy(src2, src, size); } else { |