[FFmpeg-cvslog] r20064 - trunk/libavcodec/tiff.c

[kostya]

Author: kostya
Date: Mon Sep 28 07:15:27 2009
New Revision: 20064

Log:
Make TIFF decoder load compression options only for corresponding codec

Modified:
   trunk/libavcodec/tiff.c

Modified: trunk/libavcodec/tiff.c
==============================================================================
--- trunk/libavcodec/tiff.c	Sun Sep 27 18:52:05 2009	(r20063)
+++ trunk/libavcodec/tiff.c	Mon Sep 28 07:15:27 2009	(r20064)
@@ -437,8 +437,12 @@ static int tiff_decode_tag(TiffContext *
         }
         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;