Merge commit 'c55f2ae2b8d4de473f945aebd6a7a89b6b83e87a'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 17:58:39 +0000 (14:58 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 17:58:39 +0000 (14:58 -0300)
commit162989521ce2cbb19f2b255be3248cbcbaac5fc2
tree00c43ae75d22b17a5142eb90c277cf44f60199b9
parent39e9a7a80fd30d11f04031a141cf0db20be4953f
parentc55f2ae2b8d4de473f945aebd6a7a89b6b83e87a
Merge commit 'c55f2ae2b8d4de473f945aebd6a7a89b6b83e87a'

* commit 'c55f2ae2b8d4de473f945aebd6a7a89b6b83e87a':
  avprobe: Handle unknown values for the color description

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>