[FFmpeg-cvslog] Merge commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  6 23:19:41 2014 +0200| [00acf5c42ae29c5ea071d42987a841731376f596] | committer: Michael Niedermayer

Merge commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c'

* commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c':
  avcodec options: add enum option for colorspace

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

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