From cd55954e4e8cfe7c5653fc9df1d6ecdf2533dd00 Mon Sep 17 00:00:00 2001 From: ivo Date: Fri, 5 Aug 2005 01:24:37 +0000 Subject: Fix the return types of all (six) libvo API functions. Used to be uint32_t, but return values can be negative (VO_ERROR, VO_NOTAVAIL and VO_NOTIMPL), so it's changed to int now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16172 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_3dfx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libvo/vo_3dfx.c') diff --git a/libvo/vo_3dfx.c b/libvo/vo_3dfx.c index 26d50fe8d1..47b1570f00 100644 --- a/libvo/vo_3dfx.c +++ b/libvo/vo_3dfx.c @@ -304,7 +304,7 @@ update_target(void) targetoffset = vidpage0offset + (dispy*screenwidth + dispx)*screendepth; } -static uint32_t +static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) { int fd; @@ -414,7 +414,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin return 0; } -static uint32_t +static int draw_frame(uint8_t *src[]) { LOG("video_out_3dfx: starting display_frame\n"); @@ -427,7 +427,7 @@ draw_frame(uint8_t *src[]) return 0; } -static uint32_t +static int //draw_slice(uint8_t *src[], uint32_t slice_num) draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) { @@ -452,7 +452,7 @@ flip_page(void) screen_to_screen_stretch_blt(targetoffset, vidpage2offset, dispwidth, dispheight); } -static uint32_t +static int query_format(uint32_t format) { /* does this supports scaling? up & down? */ @@ -476,7 +476,7 @@ static void check_events(void) { } -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { if(arg) { @@ -486,7 +486,7 @@ static uint32_t preinit(const char *arg) return 0; } -static uint32_t control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data, ...) { switch (request) { case VOCTRL_QUERY_FORMAT: -- cgit v1.2.3