[FFmpeg-cvslog] iff: fix some incorrect interpretations of invalid files

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Nov 30 10:44:00 2012 +0000| [1560c3295db00119e1bef51c2eca1957edd972f4] | committer: Paul B Mahol

iff: fix some incorrect interpretations of invalid files

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavformat/iff.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavformat/iff.c b/libavformat/iff.c
index 810a7b3..e59d49b 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -167,6 +167,10 @@ static int iff_read_header(AVFormatContext *s)
     avio_skip(pb, 8);
     // codec_tag used by ByteRun1 decoder to distinguish progressive (PBM) and interlaced (ILBM) content
     st->codec->codec_tag = avio_rl32(pb);
+    iff->bitmap_compression = -1;
+    iff->svx8_compression = -1;
+    iff->maud_bits = -1;
+    iff->maud_compression = -1;
 
     while(!url_feof(pb)) {
         uint64_t orig_pos;
@@ -193,8 +197,6 @@ static int iff_read_header(AVFormatContext *s)
         case ID_MHDR:
             st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
 
-            iff->maud_bits = -1;
-            iff->maud_compression = -1;
             if (data_size < 32)
                 return AVERROR_INVALIDDATA;
             avio_skip(pb, 4);
@@ -250,7 +252,6 @@ static int iff_read_header(AVFormatContext *s)
             break;
 
         case ID_BMHD:
-            iff->bitmap_compression = -1;
             st->codec->codec_type            = AVMEDIA_TYPE_VIDEO;
             if (data_size <= 8)
                 return AVERROR_INVALIDDATA;