[FFmpeg-cvslog] avcodec/tiff: Support uncompressed G4 CCITT fax

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Aug 13 16:11:23 2015 +0200| [dd1b4ed6d98f1f4dd566a28ec5ade00712f9c27c] | committer: Michael Niedermayer

avcodec/tiff: Support uncompressed G4 CCITT fax

Fixes part of ticket700

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd1b4ed6d98f1f4dd566a28ec5ade00712f9c27c
---

 libavcodec/tiff.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index d5584a5..55ec0ac 100644
--- 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;