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_pnm.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_pnm.c')
| -rw-r--r-- | libvo/vo_pnm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_pnm.c b/libvo/vo_pnm.c index 47b123fe96..26054a2b86 100644 --- a/libvo/vo_pnm.c +++ b/libvo/vo_pnm.c @@ -116,7 +116,7 @@ void pnm_write_error(void) { * \return 0 All went well. */ -static uint32_t preinit(const char *arg) +static int preinit(const char *arg) { int ppm_type = 0, pgm_type = 0, pgmyuv_type = 0, raw_mode = 0, ascii_mode = 0; @@ -256,7 +256,7 @@ void pnm_mkdir(char *buf, int verbose) { * \return 0 All went well. */ -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) { @@ -507,7 +507,7 @@ static uint32_t draw_image(mp_image_t *mpi) /* ------------------------------------------------------------------------- */ -static uint32_t draw_frame(uint8_t *src[]) +static int draw_frame(uint8_t *src[]) { mp_msg(MSGT_VO, MSGL_V, "%s: draw_frame() is called!\n", info.short_name); return -1; @@ -515,7 +515,7 @@ static uint32_t draw_frame(uint8_t *src[]) /* ------------------------------------------------------------------------- */ -static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h, +static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) { return 0; @@ -523,7 +523,7 @@ static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h, /* ------------------------------------------------------------------------- */ -static uint32_t query_format(uint32_t format) +static int query_format(uint32_t format) { /* Ensure that for PPM we get Packed RGB and for PGM(YUV) we get * Planar YUV */ @@ -542,7 +542,7 @@ static uint32_t query_format(uint32_t format) /* ------------------------------------------------------------------------- */ -static uint32_t control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data, ...) { switch (request) { case VOCTRL_QUERY_FORMAT: |