mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885': 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
|
@ -39,7 +39,6 @@ OBJS = allfilters.o \
|
||||||
sink_buffer.o \
|
sink_buffer.o \
|
||||||
src_buffer.o \
|
src_buffer.o \
|
||||||
transform.o \
|
transform.o \
|
||||||
vf_scale.o \
|
|
||||||
video.o \
|
video.o \
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue