[FFmpeg-cvslog] Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  6 12:38:05 2014 +0100| [b76059058aa6ca89836d450b7b07797ebc2d69ec] | committer: Michael Niedermayer

Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b76059058aa6ca89836d450b7b07797ebc2d69ec
---