summaryrefslogtreecommitdiffstats
path: root/libavfilter/Makefile
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2011-11-06 21:28:05 +0100
committerNicolas George <nicolas.george@normalesup.org>2011-12-31 16:25:11 +0100
commit4962edf88926ae2b06260eb50dbc96dcd4199784 (patch)
tree656dc821a6a32091b3fec6f907860d06a00a70bd /libavfilter/Makefile
parente90a69e9550800728f36efc3ea804ccd8d1d8380 (diff)
downloadffmpeg-streaming-4962edf88926ae2b06260eb50dbc96dcd4199784.zip
ffmpeg-streaming-4962edf88926ae2b06260eb50dbc96dcd4199784.tar.gz
lavfi: add amerge audio filter.
Diffstat (limited to 'libavfilter/Makefile')
-rw-r--r--libavfilter/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 318039e..0d8f120 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -26,6 +26,7 @@ OBJS-$(CONFIG_AVCODEC) += avcodec.o
OBJS-$(CONFIG_ACONVERT_FILTER) += af_aconvert.o
OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o
+OBJS-$(CONFIG_AMERGE_FILTER) += af_amerge.o
OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o
OBJS-$(CONFIG_ARESAMPLE_FILTER) += af_aresample.o
OBJS-$(CONFIG_ASHOWINFO_FILTER) += af_ashowinfo.o
OpenPOWER on IntegriCloud