Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'

* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885':
  build: avfilter: Remove duplicate compilation entry for vf_scale

Conflicts:
	libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/Makefile

@@ -39,7 +39,6 @@ OBJS = allfilters.o                                                     \
        sink_buffer.o                                                    \
        src_buffer.o                                                     \
        transform.o                                                      \
-       vf_scale.o                                                       \
        video.o                                                          \