lavfi/concat: allow to support inputs with different frame rates

[ffmpeg] / libavfilter / vf_alphamerge.c

diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c
index d22291d205be9600a6c12381db15b87bd3bf4c2d..c5602b62278114d466c1399a5982692296d1f5db 100644 (file)
--- a/libavfilter/vf_alphamerge.c
+++ b/libavfilter/vf_alphamerge.c
@@ -154,13 +154,11 @@ static int activate(AVFilterContext *ctx)
     }
 
     if (s->main_frame && s->alpha_frame) {
-        if (ret > 0) {
-            draw_frame(ctx, s->main_frame, s->alpha_frame);
-            ret = ff_filter_frame(outlink, s->main_frame);
-            av_frame_free(&s->alpha_frame);
-            s->main_frame = NULL;
-            return ret;
-        }
+        draw_frame(ctx, s->main_frame, s->alpha_frame);
+        ret = ff_filter_frame(outlink, s->main_frame);
+        av_frame_free(&s->alpha_frame);
+        s->main_frame = NULL;
+        return ret;
     }
 
     FF_FILTER_FORWARD_STATUS(ctx->inputs[0], outlink);