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_gl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libvo/vo_gl.c') diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index e3a513e60a..06494b5745 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -159,7 +159,7 @@ static int initGl(uint32_t d_width, uint32_t d_height) { /* connect to server, create and map window, * allocate colors and (shared) memory */ -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) { int tmp; @@ -453,7 +453,7 @@ flip_page(void) } //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num) -static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) +static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) { return 0; } @@ -508,13 +508,13 @@ static uint32_t draw_image(mp_image_t *mpi) { return VO_TRUE; } -static uint32_t +static int draw_frame(uint8_t *src[]) { return VO_ERROR; } -static uint32_t +static int query_format(uint32_t format) { int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | @@ -552,7 +552,7 @@ static opt_t subopts[] = { {NULL} }; -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { // set defaults many_fmts = 1; @@ -596,7 +596,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_PAUSE: return (int_pause=1); -- cgit v1.2.3