[FFmpeg-cvslog] Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct  6 11:38:02 2013 +0200| [5710f55e490d0c3cf7348b3ca91c8c0fe4274be2] | committer: Michael Niedermayer

Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015'

* commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015':
  swscale: provide a default scaler if none is set

Conflicts:
	libswscale/utils.c

The default is left at bicubic until someone has compared the scalers
properly speed and quality wise.

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

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