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_ggi.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_ggi.c')
-rw-r--r-- | libvo/vo_ggi.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c index a4ded390a6..b3f970ad8c 100644 --- a/libvo/vo_ggi.c +++ b/libvo/vo_ggi.c @@ -143,17 +143,17 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, if (ggiSetMode(ggi_conf.vis, &mode) < 0) { mp_msg(MSGT_VO, MSGL_ERR, "[ggi] unable to set display mode\n"); - return (-1); + return -1; } if (ggiGetMode(ggi_conf.vis, &mode) < 0) { mp_msg(MSGT_VO, MSGL_ERR, "[ggi] unable to get display mode\n"); - return (-1); + return -1; } if ((mode.graphtype == GT_INVALID) || (mode.graphtype == GT_AUTO)) { mp_msg(MSGT_VO, MSGL_ERR, "[ggi] not supported depth/bpp\n"); - return (-1); + return -1; } #if 0 @@ -223,7 +223,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, } else { mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] Unknown image format: %s\n", vo_format_name(ggi_conf.srcformat)); - return (-1); + return -1; } mp_msg(MSGT_VO, MSGL_INFO, "[ggi] input: %dx%dx%d, output: %dx%dx%d\n", @@ -237,7 +237,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, ggi_conf.flushregion.x2 = vo_dwidth; ggi_conf.flushregion.y2 = vo_dheight; - return (0); + return 0; } static uint32_t get_image(mp_image_t *mpi) @@ -246,19 +246,19 @@ static uint32_t get_image(mp_image_t *mpi) if (!((IMGFMT_IS_BGR(mpi->imgfmt)) && (IMGFMT_BGR_DEPTH(mpi->imgfmt) == vo_dbpp))) { - return (VO_FALSE); + return VO_FALSE; } if (!((IMGFMT_IS_RGB(mpi->imgfmt)) && (IMGFMT_RGB_DEPTH(mpi->imgfmt) == vo_dbpp))) { - return (VO_FALSE); + return VO_FALSE; } if (!((mpi->width == ggi_conf.srcwidth) && (mpi->height == ggi_conf.srcheight))) { - return (VO_FALSE); + return VO_FALSE; } mpi->planes[1] = mpi->planes[2] = NULL; @@ -274,7 +274,7 @@ static uint32_t get_image(mp_image_t *mpi) } #endif - return (VO_TRUE); + return VO_TRUE; } @@ -288,7 +288,7 @@ static int draw_frame(uint8_t *src[]) ggi_conf.flushregion.x2 = vo_dwidth; ggi_conf.flushregion.y2 = vo_dheight; - return (0); + return 0; } static void draw_osd(void) @@ -348,7 +348,7 @@ static int draw_slice(uint8_t *src[], int stride[], ggi_conf.flushregion.y2 = vo_dy + y + h; } - return (1); + return 1; } static int query_format(uint32_t format) @@ -388,19 +388,19 @@ static int query_format(uint32_t format) return vfcap; } } - return (0); + return 0; } static int preinit(const char *arg) { if (ggiInit() != 0) { mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize GGI\n"); - return (-1); + return -1; } #ifdef HAVE_GGIWMH if (ggiWmhInit() < 0) { mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize libggiwmh\n"); - return (-1); + return -1; } #endif @@ -421,7 +421,7 @@ static int preinit(const char *arg) mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to open '%s' output\n", (ggi_conf.driver == NULL) ? "default" : ggi_conf.driver); ggiExit(); - return (-1); + return -1; } ggi_conf.drawvis = ggi_conf.vis; |