Revision 8da5d3dc libavcodec/faxcompr.c

View differences:

libavcodec/faxcompr.c
269 269

  
270 270
int ff_ccitt_unpack(AVCodecContext *avctx,
271 271
                       const uint8_t *src, int srcsize,
272
                       uint8_t *dst, int height, int stride, enum TiffCompr compr)
272
                       uint8_t *dst, int height, int stride, enum TiffCompr compr, int opts)
273 273
{
274 274
    int j;
275 275
    GetBitContext gb;
......
293 293
                return -1;
294 294
            }
295 295
        }else{
296
            int g3d1 = (compr == TIFF_G3) && !(opts & 1);
296 297
            if(compr!=TIFF_CCITT_RLE && find_group3_syncmarker(&gb, srcsize*8) < 0)
297 298
                break;
298
            if(compr==TIFF_CCITT_RLE || get_bits1(&gb))
299
            if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb))
299 300
                ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend);
300 301
            else
301 302
                ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref);

Also available in: Unified diff