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 13:03:39 +0200 |
| commit | 3bb61f55b7e3f34e815ae8267e543429a8eac8c3 (patch) | |
| tree | 3dae34e94bf687dbc7b52123e00704317ef75bed /libavformat/nutdec.c | |
| parent | 06f31d01e6e90466fd5de81aa8521de3e2b03fb8 (diff) | |
| download | ffmpeg-3bb61f55b7e3f34e815ae8267e543429a8eac8c3.tar.gz | |
avformat/nutdec: Simplify cleanup after read_header failure
by setting the FF_FMT_INIT_CLEANUP flag.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/nutdec.c')
| -rw-r--r-- | libavformat/nutdec.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index fc5a6a1542..c6c015f8f0 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -810,7 +810,7 @@ static int nut_read_header(AVFormatContext *s) pos = find_startcode(bc, MAIN_STARTCODE, pos) + 1; if (pos < 0 + 1) { av_log(s, AV_LOG_ERROR, "No main startcode found.\n"); - goto fail; + return AVERROR_INVALIDDATA; } } while (decode_main_header(nut) < 0); @@ -820,7 +820,7 @@ static int nut_read_header(AVFormatContext *s) pos = find_startcode(bc, STREAM_STARTCODE, pos) + 1; if (pos < 0 + 1) { av_log(s, AV_LOG_ERROR, "Not all stream headers found.\n"); - goto fail; + return AVERROR_INVALIDDATA; } if (decode_stream_header(nut) >= 0) initialized_stream_count++; @@ -834,7 +834,7 @@ static int nut_read_header(AVFormatContext *s) if (startcode == 0) { av_log(s, AV_LOG_ERROR, "EOF before video frames\n"); - goto fail; + return AVERROR_INVALIDDATA; } else if (startcode == SYNCPOINT_STARTCODE) { nut->next_startcode = startcode; break; @@ -857,11 +857,6 @@ static int nut_read_header(AVFormatContext *s) ff_metadata_conv_ctx(s, NULL, ff_nut_metadata_conv); return 0; - -fail: - nut_read_close(s); - - return AVERROR_INVALIDDATA; } static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int is_meta, int64_t maxpos) @@ -1302,6 +1297,7 @@ const AVInputFormat ff_nut_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("NUT"), .flags = AVFMT_SEEK_TO_PTS, .priv_data_size = sizeof(NUTContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = nut_probe, .read_header = nut_read_header, .read_packet = nut_read_packet, |