diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 20:59:01 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 20:59:01 +0300 |
| commit | a817e69131dadfc3529697dad1978810b1831d04 (patch) | |
| tree | e6e9305b6070490c18b800f34c86facb30c21a0f /libvo | |
| parent | fa47d009b4bc73a051f7a07a2399193549dc810e (diff) | |
| parent | 04d20b550dd1d00f18686ecd8ac95212aab8e109 (diff) | |
| download | mpv-a817e69131dadfc3529697dad1978810b1831d04.tar.bz2 mpv-a817e69131dadfc3529697dad1978810b1831d04.tar.xz | |
Merge svn changes up to r31100
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/x11_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index c6ffe8f860..02e42ff221 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -336,9 +336,9 @@ static void init_atoms(struct vo_x11_state *x11) void update_xinerama_info(struct vo *vo) { struct MPOpts *opts = vo->opts; - int screen = xinerama_screen; xinerama_x = xinerama_y = 0; #ifdef CONFIG_XINERAMA + int screen = xinerama_screen; if (screen >= -1 && XineramaIsActive(vo->x11->display)) { XineramaScreenInfo *screens; |