aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/Makefile
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2017-07-17 16:40:28 +0200
committerNicolas George <george@nsup.org>2017-07-30 12:27:03 +0200
commit0bc331bd57dc164acbbdd548ab4001fb4b95c97a (patch)
tree13fde2405eccd30db50d4b1cb8bfb89f4ebb239d /libavfilter/Makefile
parenta5e3b0c1934f76f21957d001853cf976a94da47b (diff)
downloadffmpeg-0bc331bd57dc164acbbdd548ab4001fb4b95c97a.tar.gz
lavfi/vf_mergeplanes: move to "activate" design.
Diffstat (limited to 'libavfilter/Makefile')
-rw-r--r--libavfilter/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 5128f0f937..16a7e87c04 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -228,7 +228,7 @@ OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o
OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += vf_maskedclamp.o framesync.o
OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync2.o
OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o
-OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o
+OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync2.o
OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o
OBJS-$(CONFIG_METADATA_FILTER) += f_metadata.o
OBJS-$(CONFIG_MIDEQUALIZER_FILTER) += vf_midequalizer.o framesync2.o