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

Conflicts:
	libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>