[Ffmpeg-cvslog] r5484 - in trunk/libavformat: asf.c avidec.c matroska.c nsvdec.c nut.c ogg.c ogg2.c smacker.c utils.c

[mru]

Author: mru
Date: Fri Jun 16 09:54:37 2006
New Revision: 5484

Modified:
   trunk/libavformat/asf.c
   trunk/libavformat/avidec.c
   trunk/libavformat/matroska.c
   trunk/libavformat/nsvdec.c
   trunk/libavformat/nut.c
   trunk/libavformat/ogg.c
   trunk/libavformat/ogg2.c
   trunk/libavformat/smacker.c
   trunk/libavformat/utils.c

Log:
free codec extradata in av_close_input_file


Modified: trunk/libavformat/asf.c
==============================================================================
--- trunk/libavformat/asf.c	(original)
+++ trunk/libavformat/asf.c	Fri Jun 16 09:54:37 2006
@@ -730,7 +730,6 @@
     for(i=0;i<s->nb_streams;i++) {
         AVStream *st = s->streams[i];
         av_free(st->priv_data);
-        av_free(st->codec->extradata);
     av_free(st->codec->palctrl);
     }
     return 0;

Modified: trunk/libavformat/avidec.c
==============================================================================
--- trunk/libavformat/avidec.c	(original)
+++ trunk/libavformat/avidec.c	Fri Jun 16 09:54:37 2006
@@ -898,7 +898,6 @@
         AVStream *st = s->streams[i];
         AVIStream *ast = st->priv_data;
         av_free(ast);
-        av_free(st->codec->extradata);
         av_free(st->codec->palctrl);
     }
 

Modified: trunk/libavformat/matroska.c
==============================================================================
--- trunk/libavformat/matroska.c	(original)
+++ trunk/libavformat/matroska.c	Fri Jun 16 09:54:37 2006
@@ -2630,10 +2630,6 @@
         av_free(track);
     }
 
-    for (n = 0; n < s->nb_streams; n++) {
-        av_free(s->streams[n]->codec->extradata);
-    }
-
     memset(matroska, 0, sizeof(MatroskaDemuxContext));
 
     return 0;

Modified: trunk/libavformat/nsvdec.c
==============================================================================
--- trunk/libavformat/nsvdec.c	(original)
+++ trunk/libavformat/nsvdec.c	Fri Jun 16 09:54:37 2006
@@ -705,7 +705,6 @@
             av_free(ast->index_entries);
             av_free(ast);
         }
-        av_free(st->codec->extradata);
         av_free(st->codec->palctrl);
     }
 

Modified: trunk/libavformat/nut.c
==============================================================================
--- trunk/libavformat/nut.c	(original)
+++ trunk/libavformat/nut.c	Fri Jun 16 09:54:37 2006
@@ -1415,9 +1415,6 @@
     NUTContext *nut = s->priv_data;
     int i;
 
-    for(i=0;i<s->nb_streams;i++) {
-        av_freep(&s->streams[i]->codec->extradata);
-    }
     av_freep(&nut->stream);
 
     return 0;

Modified: trunk/libavformat/ogg.c
==============================================================================
--- trunk/libavformat/ogg.c	(original)
+++ trunk/libavformat/ogg.c	Fri Jun 16 09:54:37 2006
@@ -249,7 +249,6 @@
 
     ogg_stream_clear(&context->os) ;
     ogg_sync_clear(&context->oy) ;
-    av_freep(&avfcontext->streams[0]->codec.extradata);
 
     return 0 ;
 }

Modified: trunk/libavformat/ogg2.c
==============================================================================
--- trunk/libavformat/ogg2.c	(original)
+++ trunk/libavformat/ogg2.c	Fri Jun 16 09:54:37 2006
@@ -542,7 +542,6 @@
     for (i = 0; i < ogg->nstreams; i++){
         av_free (ogg->streams[i].buf);
         av_free (ogg->streams[i].private);
-        av_freep (&s->streams[i]->codec->extradata);
     }
     av_free (ogg->streams);
     return 0;

Modified: trunk/libavformat/smacker.c
==============================================================================
--- trunk/libavformat/smacker.c	(original)
+++ trunk/libavformat/smacker.c	Fri Jun 16 09:54:37 2006
@@ -329,11 +329,6 @@
     if(smk->frm_flags)
         av_free(smk->frm_flags);
 
-    for(i=0;i<s->nb_streams;i++) {
-        AVStream *st = s->streams[i];
-        if(st->codec->extradata)
-            av_free(st->codec->extradata);
-    }
     return 0;
 }
 

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Fri Jun 16 09:54:37 2006
@@ -2167,6 +2167,7 @@
             av_parser_close(st->parser);
         }
         av_free(st->index_entries);
+        av_free(st->codec->extradata);
         av_free(st->codec);
         av_free(st);
     }