avformat/concatdec: fix "warning: explicitly assigning a variable of type int to...
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Sep 2014 23:22:57 +0000 (01:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Sep 2014 09:48:39 +0000 (11:48 +0200)
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/concatdec.c

index 4590dc59232aa2853b526ab3875f775fbac0adc2..9e9857958d268c326a7ebcde7974da2a32e59965 100644 (file)
@@ -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: