Merge commit 'c732c62cee43f651775af5547cff99d418248542'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 20:28:23 +0000 (22:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 20:28:45 +0000 (22:28 +0200)
* commit 'c732c62cee43f651775af5547cff99d418248542':
  doc: expand description for some color properties

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/pixfmt.h

Simple merge