Merge commit '706af9227b58657c73e3a4df3689da734f010500'
authorClément Bœsch <u@pkh.me>
Sat, 8 Apr 2017 12:50:12 +0000 (14:50 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 8 Apr 2017 12:50:12 +0000 (14:50 +0200)
* commit '706af9227b58657c73e3a4df3689da734f010500':
  lavu: Document the color properties enumeration values origin

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavutil/pixfmt.h

Simple merge