summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-29 22:17:50 +0100
committerwm4 <wm4@nowhere>2013-12-29 22:18:27 +0100
commit56ce2a39be53be9b06ba815c56d768d0e45f3ac3 (patch)
tree08e425d9db576f33a630d5be4e76ede78a5d7be4 /player
parentf06a870b88bd99fa770839763736c01c4c51dc07 (diff)
downloadmpv-56ce2a39be53be9b06ba815c56d768d0e45f3ac3.tar.bz2
mpv-56ce2a39be53be9b06ba815c56d768d0e45f3ac3.tar.xz
video: fix --brightness etc. options
They were set before the VO was intitialized, which silently failed.
Diffstat (limited to 'player')
-rw-r--r--player/video.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/player/video.c b/player/video.c
index 039248c1d0..17eaab619e 100644
--- a/player/video.c
+++ b/player/video.c
@@ -65,6 +65,7 @@ static void reconfig_video(struct MPContext *mpctx,
const struct mp_image_params *params,
bool probe_only)
{
+ struct MPOpts *opts = mpctx->opts;
struct dec_video *d_video = mpctx->d_video;
d_video->decoder_output = *params;
@@ -96,6 +97,19 @@ static void reconfig_video(struct MPContext *mpctx,
int r = vo_reconfig(mpctx->video_out, &p, 0);
if (r < 0)
d_video->vfilter->initialized = -1;
+
+ if (r >= 0) {
+ if (opts->gamma_gamma != 1000)
+ video_set_colors(d_video, "gamma", opts->gamma_gamma);
+ if (opts->gamma_brightness != 1000)
+ video_set_colors(d_video, "brightness", opts->gamma_brightness);
+ if (opts->gamma_contrast != 1000)
+ video_set_colors(d_video, "contrast", opts->gamma_contrast);
+ if (opts->gamma_saturation != 1000)
+ video_set_colors(d_video, "saturation", opts->gamma_saturation);
+ if (opts->gamma_hue != 1000)
+ video_set_colors(d_video, "hue", opts->gamma_hue);
+ }
}
static void recreate_video_filters(struct MPContext *mpctx)