diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-20 17:22:56 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-20 17:22:56 +0000 |
| commit | ade8d8b939ccdb3d0c02fed59bdce2f355daa177 (patch) | |
| tree | d27ef632a7cb7c94c81c5aaa76c39cb5e17ebf05 | |
| parent | ccafd47251a83cab01dcde42dc09db425c80e69a (diff) | |
| download | ffmpeg-ade8d8b939ccdb3d0c02fed59bdce2f355daa177.tar.gz | |
uniformize AVStream->priv_data freeing in av_close_input_stream
Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/asf.c | 1 | ||||
| -rw-r--r-- | libavformat/avidec.c | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 1 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 1 |
5 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index df2003ad0b..faa0d6916a 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -925,7 +925,6 @@ static int asf_read_close(AVFormatContext *s) asf_reset_header(s); for(i=0;i<s->nb_streams;i++) { AVStream *st = s->streams[i]; - av_free(st->priv_data); av_free(st->codec->palctrl); } return 0; diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 38561a8f94..df557c128c 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1060,8 +1060,6 @@ static int avi_read_close(AVFormatContext *s) for(i=0;i<s->nb_streams;i++) { AVStream *st = s->streams[i]; - AVIStream *ast = st->priv_data; - av_free(ast); av_free(st->codec->palctrl); } diff --git a/libavformat/mov.c b/libavformat/mov.c index 5f3577c4db..76c25a3e4d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1899,7 +1899,6 @@ static int mov_read_close(AVFormatContext *s) av_freep(&sc->drefs); if (sc->pb && sc->pb != s->pb) url_fclose(sc->pb); - av_freep(&sc); } if(mov->dv_demux){ for(i=0; i<mov->dv_fctx->nb_streams; i++){ diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index da75ff1625..6f36e0ace1 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -334,8 +334,6 @@ static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter) pid = filter->pid; if (filter->type == MPEGTS_SECTION) av_freep(&filter->u.section_filter.section_buf); - else if (filter->type == MPEGTS_PES) - av_freep(&filter->u.pes_filter.opaque); av_free(filter); ts->pids[pid] = NULL; diff --git a/libavformat/utils.c b/libavformat/utils.c index e2eb1b0c94..845c87e63e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2203,6 +2203,7 @@ void av_close_input_stream(AVFormatContext *s) av_free(st->codec->extradata); av_free(st->codec); av_free(st->filename); + av_free(st->priv_data); av_free(st); } for(i=s->nb_programs-1; i>=0; i--) { |