diff options
| author | wm4 <wm4@nowhere> | 2012-07-29 19:04:27 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-07-30 01:42:54 +0200 |
| commit | 3c986150692e5975a408cec9f2cd852d8a83e3d1 (patch) | |
| tree | 9f117a91d635eba9355af48c3f8a468e1a9cf6cb | |
| parent | 614f847516b7ed98784b8d491a417e037ff2f391 (diff) | |
| download | mpv-3c986150692e5975a408cec9f2cd852d8a83e3d1.tar.bz2 mpv-3c986150692e5975a408cec9f2cd852d8a83e3d1.tar.xz | |
vo_gl, vo_gl3: honor global --vsync option
Both VOs will now by default try to set vsync according to the global
vsync setting. By default, vsync is enabled, and passing --no-vsync will
disable it.
The --vsync option used to matter for vo_vesa only, but that VO has been
removed.
| -rw-r--r-- | libvo/video_out.c | 2 | ||||
| -rw-r--r-- | libvo/vo_gl.c | 2 | ||||
| -rw-r--r-- | libvo/vo_gl3.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 0adc82c090..ce0ccd137a 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -51,7 +51,7 @@ int xinerama_y; int vo_nomouse_input = 0; int vo_grabpointer = 1; int vo_doublebuffering = 1; -int vo_vsync = 0; +int vo_vsync = 1; int vo_fs = 0; int vo_fsmode = 0; float vo_panscan = 0.0f; diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 1a1336de9c..4d98856ea9 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -1194,7 +1194,7 @@ static int preinit(struct vo *vo, const char *arg) .use_rectangle = -1, .ati_hack = -1, .force_pbo = -1, - .swap_interval = 1, + .swap_interval = vo_vsync, .custom_prog = NULL, .custom_tex = NULL, .custom_tlin = 1, diff --git a/libvo/vo_gl3.c b/libvo/vo_gl3.c index 4f673e951f..badb64b95a 100644 --- a/libvo/vo_gl3.c +++ b/libvo/vo_gl3.c @@ -2164,7 +2164,7 @@ static int preinit(struct vo *vo, const char *arg) .colorspace = MP_CSP_DETAILS_DEFAULTS, .use_npot = 1, .use_pbo = 0, - .swap_interval = 1, + .swap_interval = vo_vsync, .osd_color = 0xffffff, .fbo_format = GL_RGB16, .use_scale_sep = 1, |