Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 11:38:05 +0000 (12:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 11:38:09 +0000 (12:38 +0100)
commitb76059058aa6ca89836d450b7b07797ebc2d69ec
treeb220caa76d321c1d7617faea1cda63b0631eb855
parentbba7b6fc41057d4aec6b1f0e12240db56fe6e9b6
parentbba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb
Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'

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

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