comparison tiff.c @ 10304:370d05e51d90 libavcodec

Finally distinguish TIFF_CCITT_RLE and TIFF_G3 1-D case, so both of them will be decoded correctly. This fixes issue 1423.

10303:8a49525f2b1e

        }else{
            for(i = 0; i < size; i++)
                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);
            break;
        }
        av_free(src2);
        return ret;
    }

10304:370d05e51d90

        }else{
            for(i = 0; i < size; i++)
                src2[i] = ff_reverse[src[i]];
        }
        memset(src2+size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
        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, s->fax_opts);
            break;
        }
        av_free(src2);
        return ret;
    }