X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faf_join.c;h=930c9e48e736a1bae9a83363f8f1c5084c6cbeb9;hb=aa8e5eecac97dd3c87518e0accfb96dea05066c8;hp=cf5131e8dcaf0409d40983383ef978133f056f93;hpb=3895fce26ec7f6d2b1642f96ecaddede6521228e;p=ffmpeg

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index cf5131e8dca..930c9e48e73 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -472,6 +472,8 @@ static int activate(AVFilterContext *ctx)
     int nb_samples = 0;
     int64_t pts;
 
+    FF_FILTER_FORWARD_STATUS_BACK_ALL(ctx->outputs[0], ctx);
+
     if (!s->input_frames[0]) {
         ret = ff_inlink_consume_frame(ctx->inputs[0], &s->input_frames[0]);
         if (ret < 0) {
@@ -485,6 +487,9 @@ static int activate(AVFilterContext *ctx)
                 return 0;
             }
         }
+        if (!s->input_frames[0]) {
+            return 0;
+        }
     }
 
     nb_samples = s->input_frames[0]->nb_samples;