diff options
| author | Nicolas George <george@nsup.org> | 2017-07-17 16:38:18 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2017-07-30 12:27:00 +0200 |
| commit | a5e3b0c1934f76f21957d001853cf976a94da47b (patch) | |
| tree | e22a893316e5e68cf1dddef1892aba9bd882c16d /libavfilter/Makefile | |
| parent | 620608467f262a6941660e0dd27bdb73bb7fe847 (diff) | |
| download | ffmpeg-a5e3b0c1934f76f21957d001853cf976a94da47b.tar.gz | |
lavfi/vf_maskedmerge: move to "activate" design.
Diffstat (limited to 'libavfilter/Makefile')
| -rw-r--r-- | libavfilter/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 0edd33576f..5128f0f937 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -226,7 +226,7 @@ OBJS-$(CONFIG_LUT3D_FILTER) += vf_lut3d.o OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += vf_maskedclamp.o framesync.o -OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.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_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o |