Merge commit '26e20dfd06ac62da596a9549867f990f1200a04e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 21:34:06 +0000 (22:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 21:35:44 +0000 (22:35 +0100)
commitfc469e5c7f4ab477af17bc11e32472a29cf050db
treea62ea9cb59232e0d0e8dbdb0b88b0d50d3ca71ec
parent02444f02f17d0ca059c19290788aa0fef2afac3a
parent26e20dfd06ac62da596a9549867f990f1200a04e
Merge commit '26e20dfd06ac62da596a9549867f990f1200a04e'

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

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