avcodec/tiff: Support uncompressed G4 CCITT fax

Fixes part of ticket700

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index d5584a56367406024b006cd7c555974a0e3ccbbc..55ec0ac07ef30427f568573e9ce3d5fe618404ca 100644 (file)
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -460,7 +460,7 @@ static int tiff_unpack_fax(TiffContext *s, uint8_t *dst, int stride,
                "Error allocating temporary buffer\n");
         return AVERROR(ENOMEM);
     }
-    if (s->fax_opts & 2) {
+    if ((s->fax_opts & 2) && s->compr == TIFF_G3) {
         avpriv_request_sample(s->avctx, "Uncompressed fax mode");
         av_free(src2);
         return AVERROR_PATCHWELCOME;