Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avformat/sierravmd: Simplify cleanup after read_header failure

Browse source 
by setting the FF_FMT_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2020-03-21 18:31:06 +01:00
parent 5542f78d46
commit 1ebda24904
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libavformat/sierravmd.c
View file

@ -252,16 +252,13 @@ static int vmd_read_header(AVFormatContext *s)
} }
} }
av_free(raw_frame_table);
vmd->current_frame = 0; vmd->current_frame = 0;
vmd->frame_count = total_frames; vmd->frame_count = total_frames;
return 0; ret = 0;
error: error:
av_freep(&raw_frame_table); av_freep(&raw_frame_table);
av_freep(&vmd->frame_table);
return ret; return ret;
} }
@ -321,6 +318,7 @@ const AVInputFormat ff_vmd_demuxer = {
.name = "vmd", .name = "vmd",
.long_name = NULL_IF_CONFIG_SMALL("Sierra VMD"), .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD"),
.priv_data_size = sizeof(VmdDemuxContext), .priv_data_size = sizeof(VmdDemuxContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = vmd_probe, .read_probe = vmd_probe,
.read_header = vmd_read_header, .read_header = vmd_read_header,
.read_packet = vmd_read_packet, .read_packet = vmd_read_packet,