Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 12:14:10 +0000 (14:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 12:14:10 +0000 (14:14 +0200)
commit154d80eae70b73c683e70a157e73173aabb26a58
tree98854991ca12fbd5ddaebaa641919b978507088a
parent7a0e689c4517d8e6ccec6027354bd827965a9ba2
parent1c0210c7981b6a61043d9171f506b435ff5a1f5e
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@gmx.at>
Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/af_bs2b.c
libavfilter/allfilters.c
libavfilter/version.h