Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / avf_concat.c

diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index c0bd621cb4f4fc5c8d6568e07cc9bcbf9a3c5abf..b3aed3ccde2347ebcd20ea8d8b2e2a8297efbe7b 100644 (file)
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -195,7 +195,7 @@ static void process_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
         av_log(ctx, AV_LOG_ERROR, "Frame after EOF on input %s\n",
                ctx->input_pads[in_no].name);
         avfilter_unref_buffer(buf);
-    } if (in_no >= cat->cur_idx + ctx->nb_outputs) {
+    } else if (in_no >= cat->cur_idx + ctx->nb_outputs) {
         ff_bufqueue_add(ctx, &cat->in[in_no].queue, buf);
     } else {
         push_frame(ctx, in_no, buf);