diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2009-09-28 05:17:20 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2009-09-28 05:17:20 +0000 |
| commit | 8da5d3dc3792b6992e4794351125279f05c8ba0e (patch) | |
| tree | 3de8fd9a43156792a0497b79b424b114e7315b39 /libavcodec/tiff.c | |
| parent | 7c6f5238c68b1fa5e0d61afaa3f6c68e586cf9c5 (diff) | |
| download | ffmpeg-8da5d3dc3792b6992e4794351125279f05c8ba0e.tar.gz | |
Finally distinguish TIFF_CCITT_RLE and TIFF_G3 1-D case, so both of them
will be decoded correctly.
This fixes issue 1423.
Originally committed as revision 20065 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 536b74f391..39a11f7c2c 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -146,13 +146,11 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin src2[i] = ff_reverse[src[i]]; } memset(src2+size, 0, FF_INPUT_BUFFER_PADDING_SIZE); - if(s->compr == TIFF_G3 && !(s->fax_opts & 1)) - s->compr = TIFF_CCITT_RLE; switch(s->compr){ case TIFF_CCITT_RLE: case TIFF_G3: case TIFF_G4: - ret = ff_ccitt_unpack(s->avctx, src2, size, dst, lines, stride, s->compr); + ret = ff_ccitt_unpack(s->avctx, src2, size, dst, lines, stride, s->compr, s->fax_opts); break; } av_free(src2); |