aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/allfilters.c
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/allfilters.c
parente90a69e9550800728f36efc3ea804ccd8d1d8380 (diff)
downloadffmpeg-4962edf88926ae2b06260eb50dbc96dcd4199784.tar.gz
lavfi: add amerge audio filter.
Diffstat (limited to 'libavfilter/allfilters.c')
-rw-r--r--libavfilter/allfilters.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index cba7704865..621568e60c 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -36,6 +36,7 @@ void avfilter_register_all(void)
REGISTER_FILTER (ACONVERT, aconvert, af);
REGISTER_FILTER (AFORMAT, aformat, af);
+ REGISTER_FILTER (AMERGE, amerge, af);
REGISTER_FILTER (ANULL, anull, af);
REGISTER_FILTER (ARESAMPLE, aresample, af);
REGISTER_FILTER (ASHOWINFO, ashowinfo, af);