Merge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 00:22:56 +0000 (02:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 00:23:15 +0000 (02:23 +0200)
* commit '586ea0379c207a942c1f2d61e0b3a63c458cc598':
  avcodec: fix colorspace option description

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

Simple merge