diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 15:18:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 15:18:59 +0100 |
| commit | b38c79bf2327391d4fb8a7c271301ff408bdc71e (patch) | |
| tree | cd3c1092a34d8e417fe4c834b23f137227aa83e3 /libavfilter/allfilters.c | |
| parent | 377d201790bbe08185b91b50c8bc4a3bbf951618 (diff) | |
| parent | b384e031daeb1ac612620985e3e5377bc587559c (diff) | |
Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'
* commit 'b384e031daeb1ac612620985e3e5377bc587559c':
lavfi: add volume filter
Conflicts:
Changelog
libavfilter/Makefile
libavfilter/af_volume.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/allfilters.c')
| -rw-r--r-- | libavfilter/allfilters.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 5a1f939781..f9cacfc9bf 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -61,10 +61,11 @@ void avfilter_register_all(void) REGISTER_FILTER (EBUR128, ebur128, af); REGISTER_FILTER (JOIN, join, af); REGISTER_FILTER (PAN, pan, af); + REGISTER_FILTER (RESAMPLE, resample, af); REGISTER_FILTER (SILENCEDETECT, silencedetect, af); REGISTER_FILTER (VOLUME, volume, af); + REGISTER_FILTER (VOLUME_JUSTIN, volume_justin, af); REGISTER_FILTER (VOLUMEDETECT,volumedetect,af); - REGISTER_FILTER (RESAMPLE, resample, af); REGISTER_FILTER (AEVALSRC, aevalsrc, asrc); REGISTER_FILTER (ANULLSRC, anullsrc, asrc); |