History

lavfi/vf_mergeplanes: move to "activate" design.

Nicolas George committed 9 years ago

Commit 0bc331b1 parent a5e3b0c2 files · +10 −17Browse files

Showing the changes to libavfilter/Makefile (1 of 2 files). Show all

Unified · Split

libavfilter/Makefile+1−1
@@ -228,7 +228,7 @@ OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o · 227 unmodified lines
228228 OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += vf_maskedclamp.o framesync.o
229229 OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync2.o
230230 OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o
231−OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o
231+OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync2.o
232232 OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o
233233 OBJS-$(CONFIG_METADATA_FILTER) += f_metadata.o
234234 OBJS-$(CONFIG_MIDEQUALIZER_FILTER) += vf_midequalizer.o framesync2.o

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t