diff options
| author |  wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
| commit | 1aa2e36122e6e664e42170f47d6db82873bef5aa (patch) | |
| tree | 39e13f93bcb606da9e365c7cd379132bdf53c20b /libvo/x11_common.h | |
| parent | fea8c85c8595b797fc839b113c1db252fc55c798 (diff) | |
| parent | 8cd71527ade21ea27ea24cdcc66dc71dca460f85 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
bstr.c
bstr.h
etc/input.conf
input/input.c
input/input.h
libao2/ao_pulse.c
libmpcodecs/vf_ass.c
libmpcodecs/vf_vo.c
libvo/gl_common.c
libvo/x11_common.c
mixer.c
mixer.h
mplayer.c
Diffstat (limited to 'libvo/x11_common.h')
| -rw-r--r-- | libvo/x11_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 6ba2780747..14c7e44549 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -48,7 +48,6 @@ struct vo_x11_state { unsigned long xv_colorkey; unsigned int xv_port; - int vo_mouse_autohide; int wm_type; int fs_type; int window_state; |