diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 14:14:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 14:14:10 +0200 |
commit | 154d80eae70b73c683e70a157e73173aabb26a58 (patch) | |
tree | 98854991ca12fbd5ddaebaa641919b978507088a /libavfilter/Makefile | |
parent | 7a0e689c4517d8e6ccec6027354bd827965a9ba2 (diff) | |
parent | 1c0210c7981b6a61043d9171f506b435ff5a1f5e (diff) | |
download | ffmpeg-streaming-154d80eae70b73c683e70a157e73173aabb26a58.zip ffmpeg-streaming-154d80eae70b73c683e70a157e73173aabb26a58.tar.gz |
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>
Diffstat (limited to 'libavfilter/Makefile')
-rw-r--r-- | libavfilter/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 7e66c91..65786cf 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -85,6 +85,7 @@ OBJS-$(CONFIG_BANDPASS_FILTER) += af_biquads.o OBJS-$(CONFIG_BANDREJECT_FILTER) += af_biquads.o OBJS-$(CONFIG_BASS_FILTER) += af_biquads.o OBJS-$(CONFIG_BIQUAD_FILTER) += af_biquads.o +OBJS-$(CONFIG_BS2B_FILTER) += af_bs2b.o OBJS-$(CONFIG_CHANNELMAP_FILTER) += af_channelmap.o OBJS-$(CONFIG_CHANNELSPLIT_FILTER) += af_channelsplit.o OBJS-$(CONFIG_COMPAND_FILTER) += af_compand.o |