diff options
author | ivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-05 01:24:37 +0000 |
---|---|---|
committer | ivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-05 01:24:37 +0000 |
commit | cd55954e4e8cfe7c5653fc9df1d6ecdf2533dd00 (patch) | |
tree | dc84e22e112201b3911edd0a1b6ddac9b2012f59 /libvo/vo_svga.c | |
parent | 205db1107439080dcd0915e862ae15b3289f400d (diff) | |
download | mpv-cd55954e4e8cfe7c5653fc9df1d6ecdf2533dd00.tar.bz2 mpv-cd55954e4e8cfe7c5653fc9df1d6ecdf2533dd00.tar.xz |
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
Diffstat (limited to 'libvo/vo_svga.c')
-rw-r--r-- | libvo/vo_svga.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c index e82252f2c4..dd5e90fe4b 100644 --- a/libvo/vo_svga.c +++ b/libvo/vo_svga.c @@ -119,7 +119,7 @@ int i; return -1; } -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { int i; char s[64]; @@ -351,7 +351,7 @@ int find_best_svga_mode(int req_w,int req_h, int req_bpp){ return bestmode; } -static uint32_t control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data, ...) { switch (request) { case VOCTRL_QUERY_FORMAT: @@ -398,7 +398,7 @@ static uint32_t control(uint32_t request, void *data, ...) // // This function is called to init the video driver for specific mode // -static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, +static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { int32_t req_w = width;// (d_width > 0 ? d_width : width); @@ -578,7 +578,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, return (0); } -static uint32_t draw_slice(uint8_t *image[],int stride[], +static int draw_slice(uint8_t *image[],int stride[], int w, int h, int x, int y) { assert(0); UNUSED(image);UNUSED(stride); @@ -588,7 +588,7 @@ UNUSED(x);UNUSED(y); return VO_ERROR;//this is yv12 only -> vf_scale should do all transforms } -static uint32_t draw_frame(uint8_t *src[]) { +static int draw_frame(uint8_t *src[]) { assert(0); UNUSED(src); return VO_ERROR;//this one should not be called @@ -648,7 +648,7 @@ static void uninit(void) { } /* --------------------------------------------------------------------- */ -static uint32_t query_format(uint32_t format) { +static int query_format(uint32_t format) { int32_t req_bpp,flags; int i,lastmode; vga_modeinfo * vminfo; |