[FFmpeg-cvslog] Merge commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10'

[Michael Niedermayer]

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

Merge commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10'

* commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10':
  avcodec options: add enum option for color_primaries

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

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