Merge commit 'aeaa108bafa11db290f1ada0e22dbfbd655cf2ba'

[ffmpeg] / libavfilter / af_join.c

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index cf5131e8dcaf0409d40983383ef978133f056f93..4f86e1355841706f85d608f7f64b8fd13f725966 100644 (file)
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -485,6 +485,9 @@ static int activate(AVFilterContext *ctx)
                 return 0;
             }
         }
+        if (!s->input_frames[0]) {
+            return 0;
+        }
     }
 
     nb_samples = s->input_frames[0]->nb_samples;