Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'

* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb':
  lavfi: use the correct filter context for logging an error.

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

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 46f81f2d9e770e3a3b47d009dd5305fdc300780e..7e166e04f8c876417eebf6bdc69ce4f9a5b20a18 100644 (file)
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -295,7 +295,7 @@ int avfilter_config_links(AVFilterContext *filter)
 
             if ((config_link = link->dstpad->config_props))
                 if ((ret = config_link(link)) < 0) {
-                    av_log(link->src, AV_LOG_ERROR,
+                    av_log(link->dst, AV_LOG_ERROR,
                            "Failed to configure input pad on %s\n",
                            link->dst->name);
                     return ret;