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_zr.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_zr.c')
| -rw-r--r-- | libvo/vo_zr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c index 94197394e1..f64bf419d2 100644 --- a/libvo/vo_zr.c +++ b/libvo/vo_zr.c @@ -300,7 +300,7 @@ int zr_geometry_sane(geo_t *g, unsigned int width, unsigned int height) { } -static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, +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, tmp, stretchx, stretchy; @@ -536,7 +536,7 @@ static void flip_page (void) { return; } -static uint32_t draw_frame(uint8_t * src[]) { +static int draw_frame(uint8_t * src[]) { int i, j; char *source, *dest; //printf("draw frame called\n"); @@ -554,7 +554,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) { if(format==IMGFMT_YV12 || format==IMGFMT_YUY2) return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW; return 0; @@ -573,7 +573,7 @@ static void check_events(void) { } -static uint32_t draw_slice(uint8_t *srcimg[], int stride[], +static int draw_slice(uint8_t *srcimg[], int stride[], int wf, int hf, int xf, int yf) { int i, j, w, h, x, y; /* Apply 'geometry', crop unwanted parts */ @@ -806,7 +806,7 @@ void vo_zr_revertoption(m_option_t* opt,char* param) { } -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { if(arg) { @@ -816,7 +816,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: |