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_gl2.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_gl2.c')
-rw-r--r-- | libvo/vo_gl2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index b6939e81c7..546d7be3b4 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -824,7 +824,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) { const unsigned char * glVersion; @@ -993,7 +993,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; } @@ -1021,7 +1021,7 @@ draw_frame_x11_rgb(uint8_t *src[]) } -static uint32_t +static int draw_frame(uint8_t *src[]) { uint32_t res = 0; @@ -1034,7 +1034,7 @@ draw_frame(uint8_t *src[]) return res; } -static uint32_t +static int query_format(uint32_t format) { switch(format){ @@ -1068,7 +1068,7 @@ uninit(void) #endif } -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { if(arg) { @@ -1079,7 +1079,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); |