Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Oct 2013 09:38:02 +0000 (11:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Oct 2013 09:44:05 +0000 (11:44 +0200)
commit5710f55e490d0c3cf7348b3ca91c8c0fe4274be2
tree033991c8946d5c7cf0acec24991633a6836253f6
parent7fb123429e6c153e9ea1e1af6e0165c3583894d0
parent6b3ff6f91a535d6383f41ca7bdf760165dcb6015
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@gmx.at>
libswscale/utils.c