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-08 15:19:03 +0200 |
| commit | d6d113e454c65247449ed509cf15b45dd8a207d0 (patch) | |
| tree | 227ea64366626cf3b3eb6598f3eb56006d62e5db | |
| parent | 04aa4065d7050dbad553384f4699d0cf99b89b52 (diff) | |
| download | ffmpeg-d6d113e454c65247449ed509cf15b45dd8a207d0.tar.gz | |
avformat/wc3movie: 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/wc3movie.c | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c index dfb2462072..fe2d0d4245 100644 --- a/libavformat/wc3movie.c +++ b/libavformat/wc3movie.c @@ -139,14 +139,10 @@ static int wc3_read_header(AVFormatContext *s) /* load up the name */ buffer = av_malloc(size+1); if (!buffer) - if (!buffer) { - ret = AVERROR(ENOMEM); - goto fail; - } + return AVERROR(ENOMEM); if ((ret = avio_read(pb, buffer, size)) != size) { av_freep(&buffer); - ret = AVERROR(EIO); - goto fail; + return AVERROR(EIO); } buffer[size] = 0; av_dict_set(&s->metadata, "title", buffer, @@ -168,26 +164,21 @@ static int wc3_read_header(AVFormatContext *s) default: av_log(s, AV_LOG_ERROR, "unrecognized WC3 chunk: %s\n", av_fourcc2str(fourcc_tag)); - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } fourcc_tag = avio_rl32(pb); /* chunk sizes are 16-bit aligned */ size = (avio_rb32(pb) + 1) & (~1); - if (avio_feof(pb)) { - ret = AVERROR(EIO); - goto fail; - } + if (avio_feof(pb)) + return AVERROR(EIO); } while (fourcc_tag != BRCH_TAG); /* initialize the decoder streams */ st = avformat_new_stream(s, NULL); - if (!st) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!st) + return AVERROR(ENOMEM); avpriv_set_pts_info(st, 33, 1, WC3_FRAME_FPS); wc3->video_stream_index = st->index; st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; @@ -197,10 +188,8 @@ static int wc3_read_header(AVFormatContext *s) st->codecpar->height = wc3->height; st = avformat_new_stream(s, NULL); - if (!st) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!st) + return AVERROR(ENOMEM); avpriv_set_pts_info(st, 33, 1, WC3_FRAME_FPS); wc3->audio_stream_index = st->index; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; @@ -215,9 +204,6 @@ static int wc3_read_header(AVFormatContext *s) st->codecpar->block_align = WC3_AUDIO_BITS * WC3_AUDIO_CHANNELS; return 0; -fail: - wc3_read_close(s); - return ret; } static int wc3_read_packet(AVFormatContext *s, @@ -313,6 +299,7 @@ const AVInputFormat ff_wc3_demuxer = { .name = "wc3movie", .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III movie"), .priv_data_size = sizeof(Wc3DemuxContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = wc3_probe, .read_header = wc3_read_header, .read_packet = wc3_read_packet, |