[SCM] libav/experimental: fix double free, priv_data is freed in av_open_input_stream

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 94ede53e57e5864a1f94cb5cae25cd0b142212ae
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sun Mar 26 14:06:00 2006 +0000

    fix double free, priv_data is freed in av_open_input_stream
    
    Originally committed as revision 5221 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/img.c b/libavformat/img.c
index 1943c51..888fcfa 100644
--- a/libavformat/img.c
+++ b/libavformat/img.c
@@ -116,7 +116,6 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
 
     st = av_new_stream(s1, 0);
     if (!st) {
-        av_free(s);
         return -ENOMEM;
     }
 
@@ -178,7 +177,6 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
     if (!s->is_pipe)
         url_fclose(f);
  fail:
-    av_free(s);
     return AVERROR_IO;
 }
 

-- 
Libav/FFmpeg packaging