[SCM] libav/experimental: Make TIFF decoder load compression options only for corresponding codec

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7c6f5238c68b1fa5e0d61afaa3f6c68e586cf9c5
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Mon Sep 28 05:15:27 2009 +0000

    Make TIFF decoder load compression options only for corresponding codec
    
    Originally committed as revision 20064 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index c4f4523..536b74f 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;

-- 
Libav/FFmpeg packaging