Merge commit '7471352f1915813cda725ce624607d84b5a3a61c'
authorClément Bœsch <u@pkh.me>
Thu, 30 Mar 2017 21:18:56 +0000 (23:18 +0200)
committerClément Bœsch <u@pkh.me>
Thu, 30 Mar 2017 21:18:56 +0000 (23:18 +0200)
* commit '7471352f1915813cda725ce624607d84b5a3a61c':
  pixfmt: Add GRAY12

This commit is a noop, see 638b216d4f54a330d0fad6cc7e1f4ec066594abe

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

Trivial merge