summaryrefslogtreecommitdiffstats
path: root/libvo/vo_winvidix.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_winvidix.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_winvidix.c')
-rw-r--r--libvo/vo_winvidix.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c
index 6f66418b6b..36102517e4 100644
--- a/libvo/vo_winvidix.c
+++ b/libvo/vo_winvidix.c
@@ -181,7 +181,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l
}
-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){
title = "MPlayer VIDIX WIN32 Overlay";
panscan_init();
@@ -281,7 +281,7 @@ static void flip_page(void){
return;
}
-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){
UNUSED(src);
UNUSED(stride);
UNUSED(w);
@@ -292,13 +292,13 @@ static uint32_t draw_slice(uint8_t *src[], int stride[],int w, int h, int x, int
return(-1);
}
-static uint32_t draw_frame(uint8_t *src[]){
+static int draw_frame(uint8_t *src[]){
UNUSED(src);
mp_msg(MSGT_VO, MSGL_FATAL, "[winvidix] error: didn't use vidix draw_frame!\n");
return(-1);
}
-static uint32_t query_format(uint32_t format){
+static int query_format(uint32_t format){
return(vidix_query_fourcc(format));
}
@@ -315,7 +315,7 @@ static void uninit(void){
//
}
-static uint32_t preinit(const char *arg){
+static int preinit(const char *arg){
if (arg)
vidix_name = strdup(arg);
else
@@ -330,7 +330,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_FULLSCREEN:
if(!vo_fs){vo_fs=1;ShowWindow(hWndFS,SW_SHOW);SetForegroundWindow(hWndFS);}