[FFmpeg-cvslog] Merge commit '26e20dfd06ac62da596a9549867f990f1200a04e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  2 22:34:06 2014 +0100| [fc469e5c7f4ab477af17bc11e32472a29cf050db] | committer: Michael Niedermayer

Merge commit '26e20dfd06ac62da596a9549867f990f1200a04e'

* commit '26e20dfd06ac62da596a9549867f990f1200a04e':
  options_table: fix colorspace minimum option value

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

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