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

avformat/av1dec: Simplify cleanup after read_header failure

Browse Source 
by setting the FF_FMT_INIT_CLEANUP flag.

Reviewed-by: James Almer <jamrial@gmail.com>
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 ef7eaa4529
commit 1500b7dfa5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/av1dec.c
View File

@ -77,17 +77,14 @@ static int read_header(AVFormatContext *s, const AVRational *framerate, AVBSFCon
return ret; return ret;
ret = avcodec_parameters_copy((*bsf)->par_in, st->codecpar); ret = avcodec_parameters_copy((*bsf)->par_in, st->codecpar);
if (ret < 0) { if (ret < 0)
av_bsf_free(bsf);
return ret; return ret;
}
ret = av_bsf_init(*bsf); ret = av_bsf_init(*bsf);
if (ret < 0) if (ret < 0)
av_bsf_free(bsf);
return ret; return ret;
return 0;
} }
#define DEC AV_OPT_FLAG_DECODING_PARAM #define DEC AV_OPT_FLAG_DECODING_PARAM
@ -285,6 +282,7 @@ const AVInputFormat ff_av1_demuxer = {
.name = "av1", .name = "av1",
.long_name = NULL_IF_CONFIG_SMALL("AV1 Annex B"), .long_name = NULL_IF_CONFIG_SMALL("AV1 Annex B"),
.priv_data_size = sizeof(AnnexBContext), .priv_data_size = sizeof(AnnexBContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = annexb_probe, .read_probe = annexb_probe,
.read_header = annexb_read_header, .read_header = annexb_read_header,
.read_packet = annexb_read_packet, .read_packet = annexb_read_packet,
@ -472,6 +470,7 @@ const AVInputFormat ff_obu_demuxer = {
.name = "obu", .name = "obu",
.long_name = NULL_IF_CONFIG_SMALL("AV1 low overhead OBU"), .long_name = NULL_IF_CONFIG_SMALL("AV1 low overhead OBU"),
.priv_data_size = sizeof(ObuContext), .priv_data_size = sizeof(ObuContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = obu_probe, .read_probe = obu_probe,
.read_header = obu_read_header, .read_header = obu_read_header,
.read_packet = obu_read_packet, .read_packet = obu_read_packet,