virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/concatdec: fix "warning: explicitly assigning a variable of type int to itself"

Browse Source 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-09-10 01:22:57 +02:00
parent 1b5ccae0f2
commit 3294fc8c47
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/concatdec.c
View File

@@ -345,7 +345,7 @@ static int concat_read_header(AVFormatContext *avf)
FAIL(AVERROR_INVALIDDATA); FAIL(AVERROR_INVALIDDATA);
} }
if ((ret = add_file(avf, filename, &file, &nb_files_alloc)) < 0) if ((ret = add_file(avf, filename, &file, &nb_files_alloc)) < 0)
FAIL(ret); goto fail;
} else if (!strcmp(keyword, "duration")) { } else if (!strcmp(keyword, "duration")) {
char *dur_str = get_keyword(&cursor); char *dur_str = get_keyword(&cursor);
int64_t dur; int64_t dur;
@@ -357,7 +357,7 @@ static int concat_read_header(AVFormatContext *avf)
if ((ret = av_parse_time(&dur, dur_str, 1)) < 0) { if ((ret = av_parse_time(&dur, dur_str, 1)) < 0) {
av_log(avf, AV_LOG_ERROR, "Line %d: invalid duration '%s'\n", av_log(avf, AV_LOG_ERROR, "Line %d: invalid duration '%s'\n",
line, dur_str); line, dur_str);
FAIL(ret); goto fail;
} }
file->duration = dur; file->duration = dur;
} else if (!strcmp(keyword, "stream")) { } else if (!strcmp(keyword, "stream")) {
@@ -387,7 +387,7 @@ static int concat_read_header(AVFormatContext *avf)
} }
} }
if (ret < 0) if (ret < 0)
FAIL(ret); goto fail;
if (!cat->nb_files) if (!cat->nb_files)
FAIL(AVERROR_INVALIDDATA); FAIL(AVERROR_INVALIDDATA);
@@ -408,7 +408,7 @@ static int concat_read_header(AVFormatContext *avf)
cat->stream_match_mode = avf->nb_streams ? MATCH_EXACT_ID : cat->stream_match_mode = avf->nb_streams ? MATCH_EXACT_ID :
MATCH_ONE_TO_ONE; MATCH_ONE_TO_ONE;
if ((ret = open_file(avf, 0)) < 0) if ((ret = open_file(avf, 0)) < 0)
FAIL(ret); goto fail;
return 0; return 0;
fail: fail: