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_macosx.m | |
| 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_macosx.m')
| -rw-r--r-- | libvo/vo_macosx.m | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index bb06440fa4..0d72aa4a95 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -84,7 +84,7 @@ static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigne } } -static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) +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 i; @@ -154,14 +154,14 @@ static void flip_page(void) [mpGLView render]; } -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) { [mpGLView setCurrentTexture]; return 0; } -static uint32_t draw_frame(uint8_t *src[]) +static int draw_frame(uint8_t *src[]) { switch (image_format) { @@ -178,7 +178,7 @@ static uint32_t draw_frame(uint8_t *src[]) return 0; } -static uint32_t query_format(uint32_t format) +static int query_format(uint32_t format) { image_format = format; @@ -204,7 +204,7 @@ static void uninit(void) [autoreleasepool release]; } -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { int parse_err = 0; @@ -260,7 +260,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) { |