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_xvidix.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_xvidix.c')
| -rw-r--r-- | libvo/vo_xvidix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index 4eadcd4204..3bf75e1489 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -226,7 +226,7 @@ static void set_window(int force_update) /* connect to server, create and map window, * allocate colors and (shared) memory */ -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) { @@ -448,7 +448,7 @@ static void flip_page(void) return; } -static uint32_t draw_slice(uint8_t * src[], int stride[], +static int draw_slice(uint8_t * src[], int stride[], int w, int h, int x, int y) { UNUSED(src); @@ -462,7 +462,7 @@ static uint32_t draw_slice(uint8_t * src[], int stride[], return (-1); } -static uint32_t draw_frame(uint8_t * src[]) +static int draw_frame(uint8_t * src[]) { UNUSED(src); mp_msg(MSGT_VO, MSGL_FATAL, @@ -470,7 +470,7 @@ static uint32_t draw_frame(uint8_t * src[]) return (-1); } -static uint32_t query_format(uint32_t format) +static int query_format(uint32_t format) { return (vidix_query_fourcc(format)); } @@ -490,7 +490,7 @@ static void uninit(void) vo_x11_uninit(); } -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { if (arg) @@ -511,7 +511,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) { |