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/vo_x11.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/vo_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index cc9ca02a6c..fd44bbf3dd 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -667,7 +667,7 @@ static uint32_t get_image(mp_image_t * mpi) || (mpi->flags & MP_IMGFLAG_PLANAR) || (mpi->flags & MP_IMGFLAG_YUV) || (mpi->width != image_width) || (mpi->height != image_height)) - return (VO_FALSE); + return VO_FALSE; if (Flip_Flag) { @@ -680,7 +680,7 @@ static uint32_t get_image(mp_image_t * mpi) } mpi->flags |= MP_IMGFLAG_DIRECT; - return (VO_TRUE); + return VO_TRUE; } static int query_format(uint32_t format) @@ -753,9 +753,9 @@ static int control(uint32_t request, void *data) switch (request) { case VOCTRL_PAUSE: - return (int_pause = 1); + return int_pause = 1; case VOCTRL_RESUME: - return (int_pause = 0); + return int_pause = 0; case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t *) data)); case VOCTRL_GUISUPPORT: |