diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2020-03-21 18:31:06 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-07-07 23:42:13 +0200 |
| commit | da45c89fe1792a12a9b0c5183fe22cf0df92814b (patch) | |
| tree | cdf62374b93193819e73ecdc9fa740aa164b219d | |
| parent | d18eee412abeb8151079a3c204483a181cacc0d9 (diff) | |
| download | ffmpeg-da45c89fe1792a12a9b0c5183fe22cf0df92814b.tar.gz | |
avformat/microdvddec: Simplify cleanup after read_header failure
by setting the FF_FMT_INIT_CLEANUP flag.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavformat/microdvddec.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavformat/microdvddec.c b/libavformat/microdvddec.c index 3c45c72595..e536d12b85 100644 --- a/libavformat/microdvddec.c +++ b/libavformat/microdvddec.c @@ -121,7 +121,7 @@ static int microdvd_read_header(AVFormatContext *s) int size = strlen(line + 11); ret = ff_alloc_extradata(st->codecpar, size); if (ret < 0) - goto fail; + return ret; memcpy(st->codecpar->extradata, line + 11, size); continue; } @@ -142,10 +142,8 @@ static int microdvd_read_header(AVFormatContext *s) if (pts == AV_NOPTS_VALUE) continue; sub = ff_subtitles_queue_insert(µdvd->q, p, strlen(p), 0); - if (!sub) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!sub) + return AVERROR(ENOMEM); sub->pos = pos; sub->pts = pts; sub->duration = get_duration(line); @@ -162,9 +160,6 @@ static int microdvd_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codecpar->codec_id = AV_CODEC_ID_MICRODVD; return 0; -fail: - ff_subtitles_queue_clean(µdvd->q); - return ret; } static int microdvd_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -207,6 +202,7 @@ const AVInputFormat ff_microdvd_demuxer = { .name = "microdvd", .long_name = NULL_IF_CONFIG_SMALL("MicroDVD subtitle format"), .priv_data_size = sizeof(MicroDVDContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = microdvd_probe, .read_header = microdvd_read_header, .read_packet = microdvd_read_packet, |