# HG changeset patch # User arpi # Date 1018133180 0 # Node ID 53ce50ac2ce2c6d7238e298ffd8912930f7a0ce2 # Parent d0d029fda13497fa2eff050add1aa96259b6509d vf_next_uninit was Wrong Thing - thx to Fredrik Kuivinen diff -r d0d029fda134 -r 53ce50ac2ce2 libmpcodecs/vf.c --- a/libmpcodecs/vf.c Sat Apr 06 22:05:01 2002 +0000 +++ b/libmpcodecs/vf.c Sat Apr 06 22:46:20 2002 +0000 @@ -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); @@ -164,10 +163,6 @@ return vf->next->put_image(vf->next,mpi); } -void vf_next_uninit(struct vf_instance_s* vf){ - return vf->next->uninit(vf->next); -} - //============================================================================ vf_instance_t* append_filters(vf_instance_t* last){ diff -r d0d029fda134 -r 53ce50ac2ce2 libmpcodecs/vf.h --- a/libmpcodecs/vf.h Sat Apr 06 22:05:01 2002 +0000 +++ b/libmpcodecs/vf.h Sat Apr 06 22:46:20 2002 +0000 @@ -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); diff -r d0d029fda134 -r 53ce50ac2ce2 libmpcodecs/vf_vo.c --- a/libmpcodecs/vf_vo.c Sat Apr 06 22:05:01 2002 +0000 +++ b/libmpcodecs/vf_vo.c Sat Apr 06 22:46:20 2002 +0000 @@ -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