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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | libavfilter/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 377bd4d701..b8d546e35d 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -72,6 +72,7 @@ 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 +OBJS-$(CONFIG_VOLUME_JUSTIN_FILTER) += af_volume_justin.o OBJS-$(CONFIG_VOLUMEDETECT_FILTER) += af_volumedetect.o OBJS-$(CONFIG_AEVALSRC_FILTER) += asrc_aevalsrc.o |