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_directx.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_directx.c')
| -rw-r--r-- | libvo/vo_directx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 6cd50e14a9..f8cf5cff1b 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -185,7 +185,7 @@ static void draw_osd(void) vo_draw_text(image_width,image_height,draw_alpha); } -static uint32_t +static int query_format(uint32_t format) { uint32_t i=0; @@ -1004,7 +1004,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l } -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { HINSTANCE hInstance = GetModuleHandle(NULL); char exedir[MAX_PATH]; @@ -1070,7 +1070,7 @@ static uint32_t preinit(const char *arg) return 0; } -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 ) { uint8_t *s; uint8_t *d; @@ -1142,7 +1142,7 @@ static void flip_page(void) image = ddsdsf.lpSurface; } -static uint32_t draw_frame(uint8_t *src[]) +static int draw_frame(uint8_t *src[]) { memcpy( image, *src, dstride * image_height ); return 0; @@ -1244,7 +1244,7 @@ static uint32_t put_image(mp_image_t *mpi){ return VO_TRUE; } -static uint32_t +static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t options, char *title, uint32_t format) { RECT rd; @@ -1444,7 +1444,7 @@ static uint32_t color_ctrl_get(char *what, int *value) return r; } -static uint32_t control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data, ...) { switch (request) { |