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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Aug 13 17:02:05 2015 +0200| [7727f76230e60c9da881a51e53f6d34f249fa2fd] | committer: Michael Niedermayer

avcodec/tiff: Support uncompressed G3 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=7727f76230e60c9da881a51e53f6d34f249fa2fd
---

 libavcodec/tiff.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 55ec0ac..d5c6398 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -460,11 +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) && s->compr == TIFF_G3) {
-        avpriv_request_sample(s->avctx, "Uncompressed fax mode");
-        av_free(src2);
-        return AVERROR_PATCHWELCOME;
-    }
+
     if (!s->fill_order) {
         memcpy(src2, src, size);
     } else {