[Mplayer-cvslog] CVS: main/libmpcodecs vf.c,1.62,1.63 vf.h,1.15,1.16 vf_rotate.c,1.4,1.5

[Arpi of Ize]

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

Modified Files:
	vf.c vf.h vf_rotate.c 
Log Message:
Fix draw_slice() in passthrough mode.
patch by Balatoni Denes <pnis at coder.hu>


Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- vf.c	5 Nov 2002 13:28:50 -0000	1.62
+++ vf.c	5 Dec 2002 00:22:37 -0000	1.63
@@ -390,6 +390,10 @@
     return vf->next->put_image(vf->next,mpi);
 }
 
+void vf_next_draw_slice(struct vf_instance_s* vf,unsigned char** src, int * stride,int w, int h, int x, int y){
+    vf->next->draw_slice(vf->next,src,stride,w,h,x,y);
+}
+
 //============================================================================
 
 vf_instance_t* append_filters(vf_instance_t* last){

Index: vf.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vf.h	10 Sep 2002 22:18:32 -0000	1.15
+++ vf.h	5 Dec 2002 00:22:37 -0000	1.16
@@ -78,6 +78,7 @@
 int vf_next_control(struct vf_instance_s* vf, int request, void* data);
 int vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt);
 int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi);
+void vf_next_draw_slice (struct vf_instance_s* vf, unsigned char** src, int* stride, int w,int h, int x, int y);
 
 vf_instance_t* append_filters(vf_instance_t* last);
 

Index: vf_rotate.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_rotate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_rotate.c	23 Oct 2002 17:51:49 -0000	1.4
+++ vf_rotate.c	5 Dec 2002 00:22:37 -0000	1.5
@@ -61,6 +61,9 @@
     }
     if (vf->priv->direction & 4){
 	vf->put_image=vf_next_put_image; // passthru mode!
+	if (vf->next->draw_slice) vf->draw_slice=vf_next_draw_slice;
+/* FIXME: this should be in an other procedure in vf.c; that should always check
+     whether the filter after the passthrough one still (not)supports slices */
 	return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
     }
     return vf_next_config(vf,height,width,d_height,d_width,flags,outfmt);