diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-13 00:13:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-13 00:13:49 +0200 |
| commit | 1caf614bec297c7e6c5f115d3ba6663d0e682e8e (patch) | |
| tree | 3a3a3d6b48cae7857d82d01d1a3cb7714d0355ac /libavfilter/Makefile | |
| parent | ad6f006081c04532335324a5a72d61f36ec386d7 (diff) | |
| parent | 012f04a277d21b2c5f28b3710fbe52321424946e (diff) | |
| download | ffmpeg-1caf614bec297c7e6c5f115d3ba6663d0e682e8e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: autoinsert resample filter when necessary.
lavfi: add lavr-based audio resampling filter.
x86: vc1: drop MMX loop filter implementation, which uses MMX2 instructions.
Conflicts:
configure
doc/filters.texi
libavcodec/x86/vc1dsp_mmx.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfiltergraph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/Makefile')
| -rw-r--r-- | libavfilter/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 962dbf63a9..70f2c9e5ca 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -2,6 +2,7 @@ include $(SUBDIR)../config.mak NAME = avfilter FFLIBS = avutil swscale +FFLIBS-$(CONFIG_RESAMPLE_FILTER) += avresample FFLIBS-$(CONFIG_ACONVERT_FILTER) += swresample FFLIBS-$(CONFIG_AMOVIE_FILTER) += avformat avcodec @@ -48,6 +49,7 @@ OBJS-$(CONFIG_ASPLIT_FILTER) += af_asplit.o OBJS-$(CONFIG_ASTREAMSYNC_FILTER) += af_astreamsync.o OBJS-$(CONFIG_EARWAX_FILTER) += af_earwax.o OBJS-$(CONFIG_PAN_FILTER) += af_pan.o +OBJS-$(CONFIG_RESAMPLE_FILTER) += af_resample.o OBJS-$(CONFIG_SILENCEDETECT_FILTER) += af_silencedetect.o OBJS-$(CONFIG_VOLUME_FILTER) += af_volume.o |