Merge commit 'bcc07e2576cb723007bea1238afd019ae2d1b005'
authorClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:21:01 +0000 (14:21 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:21:01 +0000 (14:21 +0200)
commit1cfa350429a5c3296357895efbc0a63bdf04af90
treee88261564716702c61673aab430771240029cb17
parentb4abf0e396d8978439c0676f62780abe5a5e64dc
parentbcc07e2576cb723007bea1238afd019ae2d1b005
Merge commit 'bcc07e2576cb723007bea1238afd019ae2d1b005'

* commit 'bcc07e2576cb723007bea1238afd019ae2d1b005':
  pixdesc: Use C99 array to list color properties names

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