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_fbdev.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_fbdev.c')
| -rw-r--r-- | libvo/vo_fbdev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index ed3fd62193..4c6126917d 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -792,7 +792,7 @@ static void vt_set_textarea(int u, int l) } } -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) { @@ -1030,7 +1030,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, return 0; } -static uint32_t query_format(uint32_t format) +static int query_format(uint32_t format) { if (!fb_preinit(0)) return 0; @@ -1057,9 +1057,9 @@ static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, (*draw_alpha_p)(w, h, src, srca, stride, dst, fb_line_len); } -static uint32_t draw_frame(uint8_t *src[]) { return 1; } +static int draw_frame(uint8_t *src[]) { return 1; } -static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h, int x, +static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) { uint8_t *d; @@ -1120,7 +1120,7 @@ static void uninit(void) fb_preinit(1); } -static uint32_t preinit(const char *vo_subdevice) +static int preinit(const char *vo_subdevice) { pre_init_err = 0; @@ -1161,7 +1161,7 @@ static uint32_t get_image(mp_image_t *mpi) return(VO_TRUE); } -static uint32_t control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data, ...) { switch (request) { case VOCTRL_GET_IMAGE: |