[FFmpeg-cvslog] Merge commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  6 23:29:17 2014 +0200| [cd016db4256d5dc9b4a698ac20fa49ff0ff3ce65] | committer: Michael Niedermayer

Merge commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362'

* commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362':
  avcodec options: add enum option for color_range

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

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