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_dga.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_dga.c')
| -rw-r--r-- | libvo/vo_dga.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c index 70079440b6..1aa0050337 100644 --- a/libvo/vo_dga.c +++ b/libvo/vo_dga.c @@ -119,11 +119,11 @@ static int vd_EnableMode(int depth, int bitspp, static int vd_ModeEqual(int depth, int bitspp, int rmask, int gmask, int bmask, int index) { - return ((vo_dga_modes[index].vdm_depth == depth && + return (vo_dga_modes[index].vdm_depth == depth && vo_dga_modes[index].vdm_bitspp == bitspp && vo_dga_modes[index].vdm_rmask == rmask && vo_dga_modes[index].vdm_gmask == gmask && - vo_dga_modes[index].vdm_bmask == bmask) ? 1 : 0); + vo_dga_modes[index].vdm_bmask == bmask) ? 1 : 0; } @@ -964,7 +964,7 @@ static uint32_t get_image(mp_image_t * mpi) || (mpi->type == MP_IMGTYPE_STATIC && vo_dga_nr_video_buffers > 1) || (mpi->type == MP_IMGTYPE_IP && vo_dga_nr_video_buffers < 2) || (mpi->type == MP_IMGTYPE_IPB)) - return (VO_FALSE); + return VO_FALSE; if ((mpi->flags & MP_IMGFLAG_ACCEPT_STRIDE) || (mpi->flags & MP_IMGFLAG_ACCEPT_WIDTH && @@ -978,10 +978,10 @@ static uint32_t get_image(mp_image_t * mpi) mpi->width = (vo_dga_bytes_per_line + vo_dga_vp_skip) / (mpi->bpp / 8); mpi->flags |= MP_IMGFLAG_DIRECT; - return (VO_TRUE); + return VO_TRUE; } - return (VO_FALSE); + return VO_FALSE; } static int control(uint32_t request, void *data) |