RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 11:22:14 +00:00
Code Issues Projects Releases Wiki Activity

avformat/flvenc: Add deinit function

Browse Source 
Fixes memleaks when the trailer is never written or when shift_data()
fails when writing the trailer.

Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2019-10-23 14:59:42 +02:00
parent 75a2d25a6f
commit 6f5e0a7294
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavformat/flvenc.c
View File

@ -733,7 +733,7 @@ static int flv_write_trailer(AVFormatContext *s)
int64_t cur_pos = avio_tell(s->pb); int64_t cur_pos = avio_tell(s->pb);
if (build_keyframes_idx) { if (build_keyframes_idx) {
FLVFileposition *newflv_posinfo, *p; const FLVFileposition *newflv_posinfo;
avio_seek(pb, flv->videosize_offset, SEEK_SET); avio_seek(pb, flv->videosize_offset, SEEK_SET);
put_amf_double(pb, flv->videosize); put_amf_double(pb, flv->videosize);
@ -768,19 +768,6 @@ static int flv_write_trailer(AVFormatContext *s)
put_amf_double(pb, newflv_posinfo->keyframe_timestamp); put_amf_double(pb, newflv_posinfo->keyframe_timestamp);
} }
newflv_posinfo = flv->head_filepositions;
while (newflv_posinfo) {
p = newflv_posinfo->next;
if (p) {
newflv_posinfo->next = p->next;
av_free(p);
p = NULL;
} else {
av_free(newflv_posinfo);
newflv_posinfo = NULL;
}
}
put_amf_string(pb, ""); put_amf_string(pb, "");
avio_w8(pb, AMF_END_OF_OBJECT); avio_w8(pb, AMF_END_OF_OBJECT);
@ -1047,6 +1034,20 @@ static int flv_check_bitstream(AVFormatContext *s, AVStream *st,
return ret; return ret;
} }
static void flv_deinit(AVFormatContext *s)
{
FLVContext *flv = s->priv_data;
FLVFileposition *filepos = flv->head_filepositions;
while (filepos) {
FLVFileposition *next = filepos->next;
av_free(filepos);
filepos = next;
}
flv->filepositions = flv->head_filepositions = NULL;
flv->filepositions_count = 0;
}
static const AVOption options[] = { static const AVOption options[] = {
{ "flvflags", "FLV muxer flags", offsetof(FLVContext, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" }, { "flvflags", "FLV muxer flags", offsetof(FLVContext, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" },
{ "aac_seq_header_detect", "Put AAC sequence header based on stream data", 0, AV_OPT_TYPE_CONST, {.i64 = FLV_AAC_SEQ_HEADER_DETECT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" }, { "aac_seq_header_detect", "Put AAC sequence header based on stream data", 0, AV_OPT_TYPE_CONST, {.i64 = FLV_AAC_SEQ_HEADER_DETECT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" },
@ -1076,6 +1077,7 @@ const AVOutputFormat ff_flv_muxer = {
.write_header = flv_write_header, .write_header = flv_write_header,
.write_packet = flv_write_packet, .write_packet = flv_write_packet,
.write_trailer = flv_write_trailer, .write_trailer = flv_write_trailer,
.deinit = flv_deinit,
.check_bitstream= flv_check_bitstream, .check_bitstream= flv_check_bitstream,
.codec_tag = (const AVCodecTag* const []) { .codec_tag = (const AVCodecTag* const []) {
flv_video_codec_ids, flv_audio_codec_ids, 0 flv_video_codec_ids, flv_audio_codec_ids, 0