Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:37:07 +0000 (15:37 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:40:03 +0000 (15:40 +0100)
commit8e950c9b4235bb66f3bf53608417c7cbc8148740
treeca635db4040eda218bd41d606aef2066fe8ada0f
parentefcba5a06acff1276ef30142ef2f881307c68248
parentaa37d2bf4505afc106e2a23c44afc722bb204a8e
Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e'

* commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e':
  swscale: Kill non-compiling disabled cruft

The isGray() chunk is not merged as an alternative patch actually fixing
the dead code is currently under review on the mailing-list.

The SWS_X chunk is merged, with an additional cosmetic.

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