[Mplayer-cvslog] CVS: main/libmpcodecs vd.c,1.49,1.50 vd.h,1.10,1.11 vd_ffmpeg.c,1.48,1.49 vf.h,1.13,1.14 vf_vo.c,1.16,1.17

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv23552/libmpcodecs

Modified Files:
	vd.c vd.h vd_ffmpeg.c vf.h vf_vo.c 
Log Message:
warning fixes by Dominik Mierzejewski <dominik at rangers.eu.org>


Index: vd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- vd.c	31 Aug 2002 21:03:34 -0000	1.49
+++ vd.c	1 Sep 2002 14:30:54 -0000	1.50
@@ -278,7 +278,7 @@
   return mpi;
 }
 
-void mpcodecs_draw_slice(sh_video_t *sh, unsigned char* src, int* stride, int w,int h, int x, int y) {
+void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y) {
   struct vf_instance_s* vf = sh->vfilter;
 
   if(vf->draw_slice)

Index: vd.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vd.h	24 Jul 2002 18:14:21 -0000	1.10
+++ vd.h	1 Sep 2002 14:30:54 -0000	1.11
@@ -26,6 +26,6 @@
 // callbacks:
 int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt);
 mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h);
-void mpcodecs_draw_slice(sh_video_t *sh, unsigned char* src, int* stride, int w,int h, int x, int y);
+void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y);
 
 #define VDFLAGS_DROPFRAME 3

Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- vd_ffmpeg.c	30 Aug 2002 21:44:20 -0000	1.48
+++ vd_ffmpeg.c	1 Sep 2002 14:30:54 -0000	1.49
@@ -257,7 +257,7 @@
         }
     }else
 #endif
-        mpcodecs_draw_slice (sh,(unsigned char*)src, stride, width, height, 0, y);
+        mpcodecs_draw_slice (sh,src, stride, width, height, 0, y);
 }
 
 static int init_vo(sh_video_t *sh){

Index: vf.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vf.h	4 Aug 2002 02:19:20 -0000	1.13
+++ vf.h	1 Sep 2002 14:30:54 -0000	1.14
@@ -32,7 +32,7 @@
     void (*put_image)(struct vf_instance_s* vf,
         mp_image_t *mpi);
     void (*draw_slice)(struct vf_instance_s* vf,
-        unsigned char* src, int* stride, int w,int h, int x, int y);
+        unsigned char** src, int* stride, int w,int h, int x, int y);
     void (*uninit)(struct vf_instance_s* vf);
     // caps:
     unsigned int default_caps; // used by default query_format()

Index: vf_vo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_vo.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vf_vo.c	28 Aug 2002 21:55:44 -0000	1.16
+++ vf_vo.c	1 Sep 2002 14:30:54 -0000	1.17
@@ -103,7 +103,7 @@
 }
 
 static void draw_slice(struct vf_instance_s* vf,
-        unsigned char* src, int* stride, int w,int h, int x, int y){
+        unsigned char** src, int* stride, int w,int h, int x, int y){
     if(!vo_config_count) return; // vo not configured?
     video_out->draw_slice(src,stride,w,h,x,y);
 }