[FFmpeg-cvslog] Merge commit 'efc2dfe6a0238ec08769626db899ea910be24407'

[Michael Niedermayer]

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

Merge commit 'efc2dfe6a0238ec08769626db899ea910be24407'

* commit 'efc2dfe6a0238ec08769626db899ea910be24407':
  avcodec options: add enum option for color_trc

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

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