[FFmpeg-cvslog] Merge commit '2b5b1e1e9b89063d352e2efed014f9d761b85032'

Tue Mar 21 13:22:57 EET 2017

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Tue Mar 21 12:19:25 2017 +0100| [51f88ac57b9006085c9afce65cd005f868e1d60e] | committer: Clément Bœsch

Merge commit '2b5b1e1e9b89063d352e2efed014f9d761b85032'

* 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 at pkh.me>

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