Merge commit '2b5b1e1e9b89063d352e2efed014f9d761b85032'
authorClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 11:19:25 +0000 (12:19 +0100)
committerClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 11:22:42 +0000 (12:22 +0100)
* commit '2b5b1e1e9b89063d352e2efed014f9d761b85032':
  swscale: Rename is9_OR_10 to match what it does

This commit is a noop. We use isNBPS() in these places instead since
d736b52a04. is9_15BPS() wouldn't be a good name in our codebase due to
supporting only up to 14 (see 2ea585b8e3).

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge