Merge commit '69f086e0f9'
* commit '69f086e0f9':
build: avfilter: Remove duplicate compilation entry for vf_scale
Conflicts:
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
be2c0adc96
1 changed files with 0 additions and 1 deletions
|
|
@ -39,7 +39,6 @@ OBJS = allfilters.o \
|
|||
sink_buffer.o \
|
||||
src_buffer.o \
|
||||
transform.o \
|
||||
vf_scale.o \
|
||||
video.o \
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue