generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use avformat_free_context for cleaning up muxers

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b22dbb291d)
This commit is contained in:
Martin Storsjö
2011-02-04 12:04:18 +02:00
committed by Michael Niedermayer
parent 8cf2d3d3d7
commit 42f97696ae
5 changed files with 7 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/movenchint.c
View File

@@ -81,17 +81,9 @@ fail:
url_close_dyn_buf(track->rtp_ctx->pb, &buf);
av_free(buf);
}
if (track->rtp_ctx && track->rtp_ctx->streams[0]) {
av_metadata_free(&track->rtp_ctx->streams[0]->metadata);
av_free(track->rtp_ctx->streams[0]->codec->extradata);
av_free(track->rtp_ctx->streams[0]->codec);
av_free(track->rtp_ctx->streams[0]->info);
av_free(track->rtp_ctx->streams[0]);
}
if (track->rtp_ctx) {
av_metadata_free(&track->rtp_ctx->metadata);
av_free(track->rtp_ctx->priv_data);
av_freep(&track->rtp_ctx);
avformat_free_context(track->rtp_ctx);
track->rtp_ctx = NULL;
}
av_freep(&track->enc);
/* Set a default timescale, to avoid crashes in dump_format */
@@ -488,12 +480,6 @@ void ff_mov_close_hinting(MOVTrack *track) {
url_close_dyn_buf(rtp_ctx->pb, &ptr);
av_free(ptr);
}
av_metadata_free(&rtp_ctx->streams[0]->metadata);
av_metadata_free(&rtp_ctx->metadata);
av_free(rtp_ctx->streams[0]->codec->extradata);
av_free(rtp_ctx->streams[0]->codec);
av_free(rtp_ctx->streams[0]->info);
av_free(rtp_ctx->streams[0]);
av_freep(&rtp_ctx);
avformat_free_context(rtp_ctx);
}