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)
* commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c':
  swscale: Add GRAY12

This commit is a noop, see 19be5fb7286b02fbe384f12fe4aa5c376d43d2e1

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

Trivial merge