From 7c6f5238c68b1fa5e0d61afaa3f6c68e586cf9c5 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Mon, 28 Sep 2009 05:15:27 +0000 Subject: Make TIFF decoder load compression options only for corresponding codec Originally committed as revision 20064 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/tiff.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index c4f4523359..536b74f391 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -437,8 +437,12 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t * } break; case TIFF_T4OPTIONS: + if(s->compr == TIFF_G3) + s->fax_opts = value; + break; case TIFF_T6OPTIONS: - s->fax_opts = value; + if(s->compr == TIFF_G4) + s->fax_opts = value; break; } return 0; -- cgit v1.2.3