Merge commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c'
authorClément Bœsch <u@pkh.me>
Thu, 30 Mar 2017 21:21:31 +0000 (23:21 +0200)
committerClément Bœsch <u@pkh.me>
Thu, 30 Mar 2017 21:21:31 +0000 (23:21 +0200)
commit62e46fac26462442a2ddab8072fc8773aeeed833
treeb3ee5ac8938408d5511234fe658e74e48c187822
parent719f1a923f2fa9b1f8fddd2acca6999460657b08
parentab839054e662d3227e1f795ba1dfd01fe1cf305c
Merge commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c'

* commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c':
  swscale: Add GRAY12

This commit is a noop, see 19be5fb7286b02fbe384f12fe4aa5c376d43d2e1

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