Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'

* commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435':
  avfilter: check filter link validity

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavfilter/avfilter.c
index 3805912,4098973..963f5e6
--- 1/libavfilter/avfilter.c
--- 2/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@@ -224,13 -150,14 +224,18 @@@ int avfilter_config_links(AVFilterConte
  
      for (i = 0; i < filter->nb_inputs; i ++) {
          AVFilterLink *link = filter->inputs[i];
 +        AVFilterLink *inlink;
  
          if (!link) continue;
+         if (!link->src || !link->dst) {
+             av_log(filter, AV_LOG_ERROR,
+                    "Not all input and output are properly linked (%d).\n", i);
+             return AVERROR(EINVAL);
+         }
  
 +        inlink = link->src->nb_inputs ? link->src->inputs[0] : NULL;
 +        link->current_pts = AV_NOPTS_VALUE;
 +
          switch (link->init_state) {
          case AVLINK_INIT:
              continue;