virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat: call AVOutputFormat->deinit() when freeing the context

Browse Source 
Despite the doxy stating that it's called when the muxer is destroyed,
this was not true in practice. It's only called by av_write_trailer()
and on init() failure.

An AVFormatContext may be closed without writing the trailer if errors
ocurred while muxing packets, so in order to prevent memory leaks, it
should effectively be called when freeing the muxer.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-10-18 23:23:32 -03:00
parent 27bae5aaca
commit 02cf239196
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/mux.c
View File

@ -485,6 +485,14 @@ static void flush_if_needed(AVFormatContext *s)
}
}
static void deinit_muxer(AVFormatContext *s)
{
if (s->oformat && s->oformat->deinit && s->internal->initialized)
s->oformat->deinit(s);
s->internal->initialized =
s->internal->streams_initialized = 0;
}
int avformat_init_output(AVFormatContext *s, AVDictionary **options)
{
int ret = 0;
@ -536,8 +544,7 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
return streams_already_initialized;
fail:
if (s->oformat->deinit)
s->oformat->deinit(s);
deinit_muxer(s);
return ret;
}
@ -1286,11 +1293,7 @@ fail:
}
}
if (s->oformat->deinit)
s->oformat->deinit(s);
s->internal->initialized =
s->internal->streams_initialized = 0;
deinit_muxer(s);
if (s->pb)
avio_flush(s->pb);

3
libavformat/utils.c
View File

@ -4437,6 +4437,9 @@ void avformat_free_context(AVFormatContext *s)
if (!s)
return;
if (s->oformat && s->oformat->deinit && s->internal->initialized)
s->oformat->deinit(s);
av_opt_free(s);
if (s->iformat && s->iformat->priv_class && s->priv_data)
av_opt_free(s->priv_data);