[FFmpeg-cvslog] Merge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  9 02:22:56 2014 +0200| [6414c3ecd0650d3ace687364edf99ef5d6c3f99f] | committer: Michael Niedermayer

Merge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598'

* commit '586ea0379c207a942c1f2d61e0b3a63c458cc598':
  avcodec: fix colorspace option description

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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