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)
* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb':
  lavfi: use the correct filter context for logging an error.

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

Simple merge