[SCM] libav/experimental: Remove some calls to av_free that tured out to be duplicate. This improves the behaviour of ffserver streaming asf files from disk.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:32:21 UTC 2013


The following commit has been merged in the experimental branch:
commit 2824c47368526ef0b636850f56095057c1e4d9fc
Author: Philip Gladstone <philipjsg at users.sourceforge.net>
Date:   Tue Jun 4 20:40:53 2002 +0000

    Remove some calls to av_free that tured out to be duplicate. This improves
    the behaviour of ffserver streaming asf files from disk.
    
    Originally committed as revision 662 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libav/asf.c b/libav/asf.c
index 9464111..66cae8d 100644
--- a/libav/asf.c
+++ b/libav/asf.c
@@ -426,7 +426,7 @@ static int asf_write_header(AVFormatContext *s)
     asf->nb_packets = 0;
 
     if (asf_write_header1(s, 0, 50) < 0) {
-        av_free(asf);
+        //av_free(asf);
         return -1;
     }
 
@@ -885,7 +885,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
             av_free(st->priv_data);
         av_free(st);
     }
-    av_free(asf);
+    //av_free(asf);
     return -1;
 }
 
@@ -1024,7 +1024,7 @@ static int asf_read_close(AVFormatContext *s)
         AVStream *st = s->streams[i];
         av_free(st->priv_data);
     }
-    av_free(asf);
+    //av_free(asf);
     return 0;
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list