har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/gxfenc: Add deinit function

Browse Source 
Fixes memleaks when the trailer is never written (e.g. if the call to
gxf_write_map_packet() at the end of gxf_write_header() fails).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Andreas Rheinhardt 2020-01-26 11:27:39 +01:00 committed by Michael Niedermayer
parent e6aa9b11bf
commit 262b554358
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/gxfenc.c
View File

@ -853,8 +853,6 @@ static int gxf_write_trailer(AVFormatContext *s)
int i; int i;
int ret; int ret;
ff_audio_interleave_close(s);
gxf_write_eos_packet(pb); gxf_write_eos_packet(pb);
end = avio_tell(pb); end = avio_tell(pb);
avio_seek(pb, 0, SEEK_SET); avio_seek(pb, 0, SEEK_SET);
@ -872,10 +870,17 @@ static int gxf_write_trailer(AVFormatContext *s)
avio_seek(pb, end, SEEK_SET); avio_seek(pb, end, SEEK_SET);
return 0;
}
static void gxf_deinit(AVFormatContext *s)
{
GXFContext *gxf = s->priv_data;
ff_audio_interleave_close(s);
av_freep(&gxf->flt_entries); av_freep(&gxf->flt_entries);
av_freep(&gxf->map_offsets); av_freep(&gxf->map_offsets);
return 0;
} }
static int gxf_parse_mpeg_frame(GXFStreamContext *sc, const uint8_t *buf, int size) static int gxf_parse_mpeg_frame(GXFStreamContext *sc, const uint8_t *buf, int size)
@ -1025,5 +1030,6 @@ AVOutputFormat ff_gxf_muxer = {
.write_header = gxf_write_header, .write_header = gxf_write_header,
.write_packet = gxf_write_packet, .write_packet = gxf_write_packet,
.write_trailer = gxf_write_trailer, .write_trailer = gxf_write_trailer,
.deinit = gxf_deinit,
.interleave_packet = gxf_interleave_packet, .interleave_packet = gxf_interleave_packet,
}; };