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/faxcompr.c | |
| parent | 7c6f5238c68b1fa5e0d61afaa3f6c68e586cf9c5 (diff) | |
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/faxcompr.c')
| -rw-r--r-- | libavcodec/faxcompr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index 215616309d..fb2ae1612f 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -269,7 +269,7 @@ static int find_group3_syncmarker(GetBitContext *gb, int srcsize) int ff_ccitt_unpack(AVCodecContext *avctx, const uint8_t *src, int srcsize, - uint8_t *dst, int height, int stride, enum TiffCompr compr) + uint8_t *dst, int height, int stride, enum TiffCompr compr, int opts) { int j; GetBitContext gb; @@ -293,9 +293,10 @@ int ff_ccitt_unpack(AVCodecContext *avctx, return -1; } }else{ + int g3d1 = (compr == TIFF_G3) && !(opts & 1); if(compr!=TIFF_CCITT_RLE && find_group3_syncmarker(&gb, srcsize*8) < 0) break; - if(compr==TIFF_CCITT_RLE || get_bits1(&gb)) + if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb)) ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend); else ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref); |