[FFmpeg-cvslog] Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 14:14:10 2014 +0200| [154d80eae70b73c683e70a157e73173aabb26a58] | committer: Michael Niedermayer

Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'

* commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e':
  lavfi: add Bauer stereo-to-binaural audio filter

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/version.h

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

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