diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
| commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
| tree | a838e509fdc2468220466e6337097b3ef590b00c /libvo/x11_common.c | |
| parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
| parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) | |
| download | mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.bz2 mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.xz | |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'libvo/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 6fefae61f3..36e3570c6e 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -251,11 +251,11 @@ static int x11_get_property(struct vo_x11_state *x11, Atom type, Atom ** args, int format; unsigned long bytesafter; - return (Success == + return Success == XGetWindowProperty(x11->display, x11->rootwin, type, 0, 16384, False, AnyPropertyType, &type, &format, nitems, &bytesafter, (unsigned char **) args) - && *nitems > 0); + && *nitems > 0; } static int vo_wm_detect(struct vo *vo) @@ -2093,10 +2093,10 @@ int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, char *name, int value) (port_value + 100) * (port_max - port_min) / 200 + port_min; XvSetPortAttribute(vo->x11->display, xv_port, xv_atom, port_value); - return (VO_TRUE); + return VO_TRUE; } } - return (VO_FALSE); + return VO_FALSE; } int vo_xv_get_eq(struct vo *vo, uint32_t xv_port, char *name, int *value) @@ -2159,10 +2159,10 @@ int vo_xv_get_eq(struct vo *vo, uint32_t xv_port, char *name, int *value) mp_dbg(MSGT_VO, MSGL_V, "xv_get_eq called! (%s, %d)\n", name, *value); - return (VO_TRUE); + return VO_TRUE; } } - return (VO_FALSE); + return VO_FALSE; } /** |