diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 11:18:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 11:27:02 +0100 |
| commit | 5d166de25853a41c6e2e2067f253271f22f94098 (patch) | |
| tree | f59bfda9ef35996ccf4b9a05bfb746bc46410b5a /libavfilter/Makefile | |
| parent | 96fc2908f0c04d2759d6c20275150d65798de4ac (diff) | |
| parent | 738f83582a3aaabb81309eacd4ab9c3d2acb4071 (diff) | |
| download | ffmpeg-5d166de25853a41c6e2e2067f253271f22f94098.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: add compand audio filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h
The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
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 c36b67ec5a..b3bc27c0d0 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -88,6 +88,7 @@ OBJS-$(CONFIG_BIQUAD_FILTER) += af_biquads.o OBJS-$(CONFIG_CHANNELMAP_FILTER) += af_channelmap.o OBJS-$(CONFIG_CHANNELSPLIT_FILTER) += af_channelsplit.o OBJS-$(CONFIG_COMPAND_FILTER) += af_compand.o +OBJS-$(CONFIG_COMPAND_FORK_FILTER) += af_compand_fork.o OBJS-$(CONFIG_EARWAX_FILTER) += af_earwax.o OBJS-$(CONFIG_EBUR128_FILTER) += f_ebur128.o OBJS-$(CONFIG_EQUALIZER_FILTER) += af_biquads.o |