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_dxr2.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_dxr2.c')
| -rw-r--r-- | libvo/vo_dxr2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c index 4d3a84af66..89d6933721 100644 --- a/libvo/vo_dxr2.c +++ b/libvo/vo_dxr2.c @@ -647,7 +647,7 @@ static void dxr2_set_overlay_window(void) { } -static uint32_t config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format) +static int config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format) { int arg; dxr2_threeArg_t arg3; @@ -879,7 +879,7 @@ static void draw_osd(void) } } -static uint32_t draw_frame(uint8_t * src[]) +static int draw_frame(uint8_t * src[]) { vo_mpegpes_t *p=(vo_mpegpes_t *)src[0]; if(p->id == 0x1E0) {// Video @@ -895,13 +895,13 @@ static void flip_page (void) sub_vo->flip_page(); } -static uint32_t draw_slice( uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0 ) +static int draw_slice( uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0 ) { return 0; } -static uint32_t query_format(uint32_t format) +static int query_format(uint32_t format) { if (format==IMGFMT_MPEGPES) return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_TIMER|VFCAP_SPU; @@ -951,7 +951,7 @@ static void check_events(void) #endif } -static uint32_t preinit(const char *arg) { +static int preinit(const char *arg) { int uCodeFD = -1; int uCodeSize; dxr2_uCode_t* uCode; @@ -1052,7 +1052,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_QUERY_FORMAT: |