Mercurial > mplayer.hg

changeset 33321:96bd14d567b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Sat, 07 May 2011 19:39:51 +0000
parents 53c8dd0ab057
children 99054ecaf3d9
files libvo/vosub_vidix.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vosub_vidix.c	Sat May 07 19:20:40 2011 +0000
+++ b/libvo/vosub_vidix.c	Sat May 07 19:39:51 2011 +0000
@@ -97,7 +97,7 @@
 //  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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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;