summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/concatdec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 4590dc5923..9e9857958d 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -345,7 +345,7 @@ static int concat_read_header(AVFormatContext *avf)
FAIL(AVERROR_INVALIDDATA);
}
if ((ret = add_file(avf, filename, &file, &nb_files_alloc)) < 0)
- FAIL(ret);
+ goto fail;
} else if (!strcmp(keyword, "duration")) {
char *dur_str = get_keyword(&cursor);
int64_t dur;
@@ -357,7 +357,7 @@ static int concat_read_header(AVFormatContext *avf)
if ((ret = av_parse_time(&dur, dur_str, 1)) < 0) {
av_log(avf, AV_LOG_ERROR, "Line %d: invalid duration '%s'\n",
line, dur_str);
- FAIL(ret);
+ goto fail;
}
file->duration = dur;
} else if (!strcmp(keyword, "stream")) {
@@ -387,7 +387,7 @@ static int concat_read_header(AVFormatContext *avf)
}
}
if (ret < 0)
- FAIL(ret);
+ goto fail;
if (!cat->nb_files)
FAIL(AVERROR_INVALIDDATA);
@@ -408,7 +408,7 @@ static int concat_read_header(AVFormatContext *avf)
cat->stream_match_mode = avf->nb_streams ? MATCH_EXACT_ID :
MATCH_ONE_TO_ONE;
if ((ret = open_file(avf, 0)) < 0)
- FAIL(ret);
+ goto fail;
return 0;
fail: