[MPlayer-cvslog] r33408 - trunk/libvo/vosub_vidix.c

[reimar]

Author: reimar
Date: Sat May  7 21:39:51 2011
New Revision: 33408

Log:
Fix draw_frame/draw_slice return types.

Fixes "assignment from incompatible pointer type" warnings
and also the previous unsigned type was rather stupid
since several functions return -1.

Modified:
   trunk/libvo/vosub_vidix.c

Modified: trunk/libvo/vosub_vidix.c
==============================================================================
--- trunk/libvo/vosub_vidix.c	Sat May  7 21:20:40 2011	(r33407)
+++ trunk/libvo/vosub_vidix.c	Sat May  7 21:39:51 2011	(r33408)
@@ -97,7 +97,7 @@ void vidix_term( void )
 //  vo_server->control=server_control;
 }
 
-static uint32_t vidix_draw_slice_420(uint8_t *image[], int stride[], int w,int h,int x,int y)
+static int vidix_draw_slice_420(uint8_t *image[], int stride[], int w,int h,int x,int y)
 {
     uint8_t *src;
     uint8_t *dest;
@@ -161,7 +161,7 @@ static uint32_t vidix_draw_slice_420(uin
     return -1;
 }
 
-static uint32_t vidix_draw_slice_410(uint8_t *image[], int stride[], int w,int h,int x,int y)
+static int vidix_draw_slice_410(uint8_t *image[], int stride[], int w,int h,int x,int y)
 {
     uint8_t *src;
     uint8_t *dest;
@@ -207,7 +207,7 @@ static uint32_t vidix_draw_slice_410(uin
     return -1;
 }
 
-static uint32_t vidix_draw_slice_packed(uint8_t *image[], int stride[], int w,int h,int x,int y)
+static int vidix_draw_slice_packed(uint8_t *image[], int stride[], int w,int h,int x,int y)
 {
     uint8_t *src;
     uint8_t *dest;
@@ -224,7 +224,7 @@ static uint32_t vidix_draw_slice_packed(
     return 0;
 }
 
-static uint32_t vidix_draw_slice_nv12(uint8_t *image[], int stride[], int w,int h,int x,int y)
+static int vidix_draw_slice_nv12(uint8_t *image[], int stride[], int w,int h,int x,int y)
 {
     uint8_t *src;
     uint8_t *dest;
@@ -252,7 +252,7 @@ static uint32_t vidix_draw_slice_nv12(ui
     return 0;
 }
 
-static uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
+static int vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
 {
     mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawsliceWasCalled);
     return -1;
@@ -270,7 +270,7 @@ static uint32_t  vidix_draw_image(mp_ima
     return VO_TRUE;
 }
 
-static uint32_t vidix_draw_frame(uint8_t *image[])
+static int vidix_draw_frame(uint8_t *image[])
 {
   mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawframeWasCalled);
   return -1;