[FFmpeg-cvslog] Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 21 17:39:03 2012 +0100| [be2c0adc968d3f8fc4a72dea7117529016f0a1ad] | committer: Michael Niedermayer

Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'

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

Conflicts:
	libavfilter/Makefile

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be2c0adc968d3f8fc4a72dea7117529016f0a1ad
---