[SCM] libav/experimental: 1000l to myself, dereferencing uninitalized pointer.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 79d6b9cbd04dd9b562d34ab1aeb6f946822f8ce3
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Mar 28 02:44:44 2008 +0000

    1000l to myself, dereferencing uninitalized pointer.
    
    Originally committed as revision 12614 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index b45641e..c2c1587 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -778,17 +778,17 @@ resync:
         //parse ##dc/##wb
         if(n < s->nb_streams){
           AVStream *st;
-          AVStream *st1  = s->streams[1];
-          AVIStream *ast1= st1->priv_data;
           AVIStream *ast;
           st = s->streams[n];
           ast = st->priv_data;
 
 
+            if(s->nb_streams>=2){
+                AVStream *st1  = s->streams[1];
+                AVIStream *ast1= st1->priv_data;
             //workaround for broken small-file-bug402.avi
             if(   d[2] == 'w' && d[3] == 'b'
                && n==0
-               && s->nb_streams>=2
                && st ->codec->codec_type == CODEC_TYPE_VIDEO
                && st1->codec->codec_type == CODEC_TYPE_AUDIO
                && ast->prefix == 'd'*256+'c'
@@ -799,6 +799,7 @@ resync:
                 ast = ast1;
                 av_log(s, AV_LOG_WARNING, "Invalid stream+prefix combination, assuming audio\n");
             }
+            }
 
 
           if(   (st->discard >= AVDISCARD_DEFAULT && size==0)

-- 
Libav/FFmpeg packaging