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)
commit1b6172dcf619156b777fc29ae82e90fd42328fc0
tree8ef33639106a8d70f48a35ac02789729a8cef5ed
parentdc5560efda8e956b20bed2cb955f060733bc3200
parentc732c62cee43f651775af5547cff99d418248542
Merge commit 'c732c62cee43f651775af5547cff99d418248542'

* commit 'c732c62cee43f651775af5547cff99d418248542':
  doc: expand description for some color properties

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