Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'

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

Michael Niedermayer committed 12 years ago

Commit b7605902 parents bba7b6f bba2a7c1 file · +1 −1Browse files

Unified · Split

@@ -295,7 +295,7 @@ int avfilter_config_links(AVFilterContext *filter) · 294 unmodified lines
295	295
296	296	if ((config_link = link->dstpad->config_props))
297	297	if ((ret = config_link(link)) < 0) {
298		− av_log(link->src, AV_LOG_ERROR,
	298	+ av_log(link->dst, AV_LOG_ERROR,
299	299	"Failed to configure input pad on %s\n",
300	300	link->dst->name);
301	301	return ret;

Keyboard shortcuts