highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

free codec extradata in av_close_input_file

Browse Source 
Originally committed as revision 5484 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2006-06-16 07:54:37 +00:00
parent 47dd81c75f
commit a5e9102b4b
9 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/asf.c
View File

@@ -730,7 +730,6 @@ static int asf_read_close(AVFormatContext *s)
for(i=0;i<s->nb_streams;i++) { for(i=0;i<s->nb_streams;i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
av_free(st->priv_data); av_free(st->priv_data);
av_free(st->codec->extradata);
av_free(st->codec->palctrl); av_free(st->codec->palctrl);
} }
return 0; return 0;

1
libavformat/avidec.c
View File

@@ -898,7 +898,6 @@ static int avi_read_close(AVFormatContext *s)
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
AVIStream *ast = st->priv_data; AVIStream *ast = st->priv_data;
av_free(ast); av_free(ast);
av_free(st->codec->extradata);
av_free(st->codec->palctrl); av_free(st->codec->palctrl);
} }

4
libavformat/matroska.c
View File

@@ -2630,10 +2630,6 @@ matroska_read_close (AVFormatContext *s)
av_free(track); av_free(track);
} }
for (n = 0; n < s->nb_streams; n++) {
av_free(s->streams[n]->codec->extradata);
}
memset(matroska, 0, sizeof(MatroskaDemuxContext)); memset(matroska, 0, sizeof(MatroskaDemuxContext));
return 0; return 0;

1
libavformat/nsvdec.c
View File

@@ -705,7 +705,6 @@ static int nsv_read_close(AVFormatContext *s)
av_free(ast->index_entries); av_free(ast->index_entries);
av_free(ast); av_free(ast);
} }
av_free(st->codec->extradata);
av_free(st->codec->palctrl); av_free(st->codec->palctrl);
} }

3
libavformat/nut.c
View File

@@ -1415,9 +1415,6 @@ static int nut_read_close(AVFormatContext *s)
NUTContext *nut = s->priv_data; NUTContext *nut = s->priv_data;
int i; int i;
for(i=0;i<s->nb_streams;i++) {
av_freep(&s->streams[i]->codec->extradata);
}
av_freep(&nut->stream); av_freep(&nut->stream);
return 0; return 0;

1
libavformat/ogg.c
View File

@@ -249,7 +249,6 @@ static int ogg_read_close(AVFormatContext *avfcontext) {
ogg_stream_clear(&context->os) ; ogg_stream_clear(&context->os) ;
ogg_sync_clear(&context->oy) ; ogg_sync_clear(&context->oy) ;
av_freep(&avfcontext->streams[0]->codec.extradata);
return 0 ; return 0 ;
} }

1
libavformat/ogg2.c
View File

@@ -542,7 +542,6 @@ ogg_read_close (AVFormatContext * s)
for (i = 0; i < ogg->nstreams; i++){ for (i = 0; i < ogg->nstreams; i++){
av_free (ogg->streams[i].buf); av_free (ogg->streams[i].buf);
av_free (ogg->streams[i].private); av_free (ogg->streams[i].private);
av_freep (&s->streams[i]->codec->extradata);
} }
av_free (ogg->streams); av_free (ogg->streams);
return 0; return 0;

5
libavformat/smacker.c
View File

@@ -329,11 +329,6 @@ static int smacker_read_close(AVFormatContext *s)
if(smk->frm_flags) if(smk->frm_flags)
av_free(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; return 0;
} }

1
libavformat/utils.c
View File

@@ -2167,6 +2167,7 @@ void av_close_input_file(AVFormatContext *s)
av_parser_close(st->parser); av_parser_close(st->parser);
} }
av_free(st->index_entries); av_free(st->index_entries);
av_free(st->codec->extradata);
av_free(st->codec); av_free(st->codec);
av_free(st); av_free(st);
} }