diff options
| author | wm4 <wm4@mplayer2.org> | 2012-07-28 17:07:49 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-07-28 17:24:05 +0200 |
| commit | 51e198c2a1e43b74ad35ef358628dcd8791158d9 (patch) | |
| tree | 60f6c2255ed912a7a4866b71728104a2cb2442f1 /libvo/x11_common.h | |
| parent | 2793e7eb70a342b346788f83e1ed660c8e0d491e (diff) | |
| parent | 7dfaaa95104a8e6dc024fddaf1b49c71768f1be7 (diff) | |
| download | mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.bz2 mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.xz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
.gitignore
bstr.c
cfg-mplayer.h
defaultopts.c
libvo/video_out.c
The conflict in bstr.c is due to uau adding a bstr_getline function in
commit 2ba8b91a97e7e8. This function already existed in this branch.
While uau's function is obviously derived from mine, it's incompatible.
His function preserves line breaks, while mine strips them. Add a
bstr_strip_linebreaks function, fix all other uses of bstr_getline, and
pick uau's implementation.
In .gitignore, change vo_gl3_shaders.h to use an absolute path
additional to resolving the merge conflict.
Diffstat (limited to 'libvo/x11_common.h')
| -rw-r--r-- | libvo/x11_common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 14c7e44549..bd340c822d 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -95,6 +95,7 @@ struct vo_x11_state { Atom XAWM_PROTOCOLS; Atom XAWM_DELETE_WINDOW; Atom XAUTF8_STRING; + Atom XA_NET_WM_CM; }; #if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV) @@ -137,6 +138,7 @@ void vo_x11_uninit(struct vo *vo); Colormap vo_x11_create_colormap(struct vo *vo, XVisualInfo *vinfo); uint32_t vo_x11_set_equalizer(struct vo *vo, const char *name, int value); uint32_t vo_x11_get_equalizer(const char *name, int *value); +bool vo_x11_screen_is_composited(struct vo *vo); void fstype_help(void); void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y, unsigned int width, unsigned int height, int flags, |