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_xover.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_xover.c')
| -rw-r--r-- | libvo/vo_xover.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c index 0b4a97524d..7cbd71360d 100644 --- a/libvo/vo_xover.c +++ b/libvo/vo_xover.c @@ -204,7 +204,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) { XVisualInfo vinfo; @@ -377,7 +377,7 @@ static void flip_page(void) mp_msg(MSGT_VO, MSGL_FATAL, "xover error: didn't used sub vo flip_page!\n"); } -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); @@ -390,7 +390,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, "xover error: didn't used sub vo draw_frame!\n"); @@ -410,7 +410,7 @@ static void uninit(void) video_out_xover.draw_osd = draw_osd; } -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { int i; @@ -447,7 +447,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, ...) { if(!sub_vo) return VO_ERROR; switch (request) { |