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_vesa.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_vesa.c')
| -rw-r--r-- | libvo/vo_vesa.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index dce842f6a9..ef54d45eda 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -275,7 +275,7 @@ static void __vbeCopyData(uint8_t *image) } /* is called for yuv only */ -static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) +static int draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) { int dstride=HAS_DGA()?video_mode_info.XResolution:dstW; uint8_t *dst[3]= {dga_buffer, NULL, NULL}; @@ -410,7 +410,7 @@ static void flip_page(void) } /* is called for rgb only */ -static uint32_t draw_frame(uint8_t *src[]) +static int draw_frame(uint8_t *src[]) { if(verbose > 2) printf("vo_vesa: draw_frame was called\n"); @@ -461,7 +461,7 @@ static uint32_t parseSubDevice(const char *sd) return flags; } -static uint32_t query_format(uint32_t format) +static int query_format(uint32_t format) { if(verbose > 2) printf("vo_vesa: query_format was called: %x (%s)\n",format,vo_format_name(format)); @@ -614,7 +614,7 @@ static int set_refresh(unsigned x, unsigned y, unsigned mode,struct VesaCRTCInfo * bit 3 (0x08) enables flipping (-flip) (NK: and for what?) */ -static uint32_t +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) { struct VbeInfoBlock vib; @@ -1056,7 +1056,7 @@ static void check_events(void) /* Nothing to do */ } -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { int pre_init_err = 0; int fd; @@ -1085,7 +1085,7 @@ static uint32_t preinit(const char *arg) return pre_init_err; } -static uint32_t control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data, ...) { switch (request) { case VOCTRL_QUERY_FORMAT: |