[FFmpeg-cvslog] Merge commit 'c55f2ae2b8d4de473f945aebd6a7a89b6b83e87a'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 30 14:58:39 2017 -0300| [162989521ce2cbb19f2b255be3248cbcbaac5fc2] | committer: James Almer

Merge commit 'c55f2ae2b8d4de473f945aebd6a7a89b6b83e87a'

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

This commit is a noop.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=162989521ce2cbb19f2b255be3248cbcbaac5fc2
---