[Mplayer-cvslog] CVS: main/libmpcodecs vf.c,1.1,1.2 vf.h,1.1,1.2 vf_vo.c,1.1,1.2

[Arpi of Ize]

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

Modified Files:
	vf.c vf.h vf_vo.c 
Log Message:
vf_next_uninit was Wrong Thing - thx to Fredrik Kuivinen

Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vf.c	6 Apr 2002 22:05:01 -0000	1.1
+++ vf.c	6 Apr 2002 22:46:20 -0000	1.2
@@ -137,7 +137,6 @@
     vf->control=vf_next_control;
     vf->query_format=vf_next_query_format;
     vf->put_image=vf_next_put_image;
-    vf->uninit=vf_next_uninit;
     if(vf->info->open(vf,args)>0) return vf; // Success!
     free(vf);
     mp_msg(MSGT_VFILTER,MSGL_ERR,"Couldn't open video filter '%s'\n",name);
@@ -162,10 +161,6 @@
 
 void vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi){
     return vf->next->put_image(vf->next,mpi);
-}
-
-void vf_next_uninit(struct vf_instance_s* vf){
-    return vf->next->uninit(vf->next);
 }
 
 //============================================================================

Index: vf.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vf.h	6 Apr 2002 22:05:01 -0000	1.1
+++ vf.h	6 Apr 2002 22:46:20 -0000	1.2
@@ -51,7 +51,6 @@
 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);
 void vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi);
-void vf_next_uninit(struct vf_instance_s* vf);
 vf_instance_t* append_filters(vf_instance_t* last);
 
 

Index: vf_vo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_vo.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vf_vo.c	6 Apr 2002 22:05:01 -0000	1.1
+++ vf_vo.c	6 Apr 2002 22:46:20 -0000	1.2
@@ -57,10 +57,6 @@
     video_out->draw_slice(src,stride,w,h,x,y);
 }
 
-static void uninit(struct vf_instance_s* vf){
-//    video_out->uninit();
-}
-
 //===========================================================================//
 
 static int open(vf_instance_t *vf, char* args){
@@ -70,7 +66,6 @@
     vf->get_image=get_image;
     vf->put_image=put_image;
     vf->draw_slice=draw_slice;
-    vf->uninit=uninit;
     vf->priv=(void*)args; // video_out
     if(!video_out) return 0; // no vo ?
 //    if(video_out->preinit(args)) return 0; // preinit failed