Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'

* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885': build: avfilter: Remove duplicate compilation entry for vf_scale Conflicts: libavfilter/Makefile Merged-by: Michael Niedermayer <[email protected]>
SaschaVasarrhelyi · Dec 21, 2012 · be2c0ad · be2c0ad
2 parents d27edc0 + 69f086e
commit be2c0ad
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
@@ -39,7 +39,6 @@ OBJS = allfilters.o                                                     \
        sink_buffer.o                                                    \
        src_buffer.o                                                     \
        transform.o                                                      \
-       vf_scale.o                                                       \
        video.o                                                          \