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)
commit719f1a923f2fa9b1f8fddd2acca6999460657b08
treeb3ee5ac8938408d5511234fe658e74e48c187822
parentff821fdfced0de05e1e62c7fec2635ffc607f383
parent7471352f1915813cda725ce624607d84b5a3a61c
Merge commit '7471352f1915813cda725ce624607d84b5a3a61c'

* commit '7471352f1915813cda725ce624607d84b5a3a61c':
  pixfmt: Add GRAY12

This commit is a noop, see 638b216d4f54a330d0fad6cc7e1f4ec066594abe

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