aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-01 01:29:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-01 01:29:30 +0200
commit2a93f28a4b6eef8b93046e0b4e3225f2ff1e7324 (patch)
treefdd5ccc37f8d8ffdf57843865df6f92bc6ddd4f9 /libavformat/utils.c
parent3b6c0ba382cc261b81f1451366e56a7878d4919a (diff)
downloadffmpeg-2a93f28a4b6eef8b93046e0b4e3225f2ff1e7324.tar.gz
avformat_free_context: favor av_freep()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 0d88991661..93a3f69503 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2713,13 +2713,13 @@ void avformat_free_context(AVFormatContext *s)
av_free_packet(&st->cur_pkt);
}
av_dict_free(&st->metadata);
- av_free(st->index_entries);
- av_free(st->codec->extradata);
- av_free(st->codec->subtitle_header);
- av_free(st->codec);
- av_free(st->priv_data);
- av_free(st->info);
- av_free(st);
+ av_freep(&st->index_entries);
+ av_freep(&st->codec->extradata);
+ av_freep(&st->codec->subtitle_header);
+ av_freep(&st->codec);
+ av_freep(&st->priv_data);
+ av_freep(&st->info);
+ av_freep(&st);
}
for(i=s->nb_programs-1; i>=0; i--) {
av_dict_free(&s->programs[i]->metadata);
@@ -2730,7 +2730,7 @@ void avformat_free_context(AVFormatContext *s)
av_freep(&s->priv_data);
while(s->nb_chapters--) {
av_dict_free(&s->chapters[s->nb_chapters]->metadata);
- av_free(s->chapters[s->nb_chapters]);
+ av_freep(&s->chapters[s->nb_chapters]);
}
av_freep(&s->chapters);
av_dict_free(&s->metadata);