diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 21:01:44 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 21:02:42 +0300 |
commit | 033e479bec89bfda08eada1a794b94eb4ae53a35 (patch) | |
tree | dd173829b86a246f4c6929f3395091bf0a7344e5 /libvo/x11_common.c | |
parent | 70a2ded653cfe13fa30b39c66588a85076e03d6f (diff) | |
parent | 3517a9b72b06aeb962487e9d0025e22cd6d0f575 (diff) | |
download | mpv-033e479bec89bfda08eada1a794b94eb4ae53a35.tar.bz2 mpv-033e479bec89bfda08eada1a794b94eb4ae53a35.tar.xz |
Merge svn changes up to r31104
Diffstat (limited to 'libvo/x11_common.c')
-rw-r--r-- | libvo/x11_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 02e42ff221..056c452b2d 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -338,9 +338,9 @@ void update_xinerama_info(struct vo *vo) { struct MPOpts *opts = vo->opts; xinerama_x = xinerama_y = 0; #ifdef CONFIG_XINERAMA - int screen = xinerama_screen; - if (screen >= -1 && XineramaIsActive(vo->x11->display)) + if (xinerama_screen >= -1 && XineramaIsActive(vo->x11->display)) { + int screen = xinerama_screen; XineramaScreenInfo *screens; int num_screens; |