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_bl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libvo/vo_bl.c') diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c index 527d16a080..817ddbb931 100644 --- a/libvo/vo_bl.c +++ b/libvo/vo_bl.c @@ -213,7 +213,7 @@ static bl_properties_t bls[NO_BLS] = { &bml_init, &bml_write_frame, &bml_close, &udp_init, &udp_send, &udp_close } }; -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) { void * ptr; @@ -293,11 +293,11 @@ static void flip_page (void) { return; } -static uint32_t draw_frame(uint8_t * src[]) { +static int draw_frame(uint8_t * src[]) { return 0; } -static uint32_t query_format(uint32_t format) { +static int query_format(uint32_t format) { if (format == bl->img_format) return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW; return 0; @@ -320,7 +320,7 @@ static void uninit(void) { static void check_events(void) { } -static uint32_t draw_slice(uint8_t *srcimg[], int stride[], +static int draw_slice(uint8_t *srcimg[], int stride[], int wf, int hf, int xf, int yf) { int i, j, w, h, x, y; uint8_t *dst; @@ -339,7 +339,7 @@ static uint32_t draw_slice(uint8_t *srcimg[], int stride[], return 0; } -static uint32_t preinit(const char *arg) { +static int preinit(const char *arg) { char *p, *q; int end = 0, i; char txt[256]; @@ -465,7 +465,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: return query_format(*((uint32_t*)data)); -- cgit v1.2.3