summaryrefslogtreecommitdiffstats
path: root/libvo/vo_dxr3.c
diff options
context:
space:
mode:
authorivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-05 01:24:37 +0000
committerivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-05 01:24:37 +0000
commitcd55954e4e8cfe7c5653fc9df1d6ecdf2533dd00 (patch)
treedc84e22e112201b3911edd0a1b6ddac9b2012f59 /libvo/vo_dxr3.c
parent205db1107439080dcd0915e862ae15b3289f400d (diff)
downloadmpv-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_dxr3.c')
-rw-r--r--libvo/vo_dxr3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index 92ccc4028d..0ead3f99ca 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -270,7 +270,7 @@ static overlay_t *overlay_data;
/* Functions for working with the em8300's internal clock */
/* End of internal clock functions */
-static uint32_t control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data, ...)
{
switch (request) {
case VOCTRL_GUISUPPORT:
@@ -418,7 +418,7 @@ void calculate_cvals(unsigned long mask, int *shift, int *prec)
}
}
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+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 tmp1, tmp2, size;
em8300_register_t reg;
@@ -751,7 +751,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];
@@ -812,7 +812,7 @@ static void flip_page(void)
}
}
-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 -1;
}
@@ -864,7 +864,7 @@ static void check_events(void)
{
}
-static uint32_t preinit(const char *arg)
+static int preinit(const char *arg)
{
char devname[MAX_STR_SIZE];
int fdflags = O_WRONLY;