diff options
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); |