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/video_out.h | |
| 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/video_out.h')
| -rw-r--r-- | libvo/video_out.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index 1ed670eb3e..83de798f5b 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -105,7 +105,7 @@ typedef struct vo_functions_s * arg - currently it's vo_subdevice * returns: zero on successful initialization, non-zero on error. */ - uint32_t (*preinit)(const char *arg); + int (*preinit)(const char *arg); /* * Initialize (means CONFIGURE) the display driver. * params: @@ -116,21 +116,21 @@ typedef struct vo_functions_s * format: fourcc of pixel format * returns : zero on successful initialization, non-zero on error. */ - uint32_t (*config)(uint32_t width, uint32_t height, uint32_t d_width, + int (*config)(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format); /* * Control interface */ - uint32_t (*control)(uint32_t request, void *data, ...); + int (*control)(uint32_t request, void *data, ...); /* * Display a new RGB/BGR frame of the video to the screen. * params: * src[0] - pointer to the image */ - uint32_t (*draw_frame)(uint8_t *src[]); + int (*draw_frame)(uint8_t *src[]); /* * Draw a planar YUV slice to the buffer: @@ -140,7 +140,7 @@ typedef struct vo_functions_s * w,h = width*height of area to be copied (in Y pixels) * x,y = position at the destination image (in Y pixels) */ - uint32_t (*draw_slice)(uint8_t *src[], int stride[], int w,int h, int x,int y); + int (*draw_slice)(uint8_t *src[], int stride[], int w,int h, int x,int y); /* * Draws OSD to the screen buffer |