Merge commit 'cffecc0e'

* commit 'cffecc0e':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
	libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/graphparser.c

@@ -132,6 +132,7 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind
         if (args)
             av_log(log_ctx, AV_LOG_ERROR, " with args '%s'", args);
         av_log(log_ctx, AV_LOG_ERROR, "\n");
+        avfilter_free(*filt_ctx);
     }
 
     av_free(tmp_args);