diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-06 22:46:20 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-06 22:46:20 +0000 |
commit | 1d63493c0fa694098de06b66053d30258e70aa94 (patch) | |
tree | 601ac052b3d3da7faac67536e68fc4d4d9307a90 /libmpcodecs | |
parent | e24cd4d942c0e7261709b4eaca527cfc9750c619 (diff) | |
download | mpv-1d63493c0fa694098de06b66053d30258e70aa94.tar.bz2 mpv-1d63493c0fa694098de06b66053d30258e70aa94.tar.xz |
vf_next_uninit was Wrong Thing - thx to Fredrik Kuivinen
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5509 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf.c | 5 | ||||
-rw-r--r-- | libmpcodecs/vf.h | 1 | ||||
-rw-r--r-- | libmpcodecs/vf_vo.c | 5 |
3 files changed, 0 insertions, 11 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 6c634652ee..fd262bc8cd 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -137,7 +137,6 @@ vf_instance_t* vf_open_filter(vf_instance_t* next, char *name, char *args){ 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 @@ 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); -} - //============================================================================ vf_instance_t* append_filters(vf_instance_t* last){ diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h index 1cba9f9323..861393fc72 100644 --- a/libmpcodecs/vf.h +++ b/libmpcodecs/vf.h @@ -51,7 +51,6 @@ int vf_next_config(struct vf_instance_s* vf, 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 --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index 3f8afe52f0..89189ca4fc 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -57,10 +57,6 @@ static void draw_slice(struct vf_instance_s* vf, 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 @@ static int open(vf_instance_t *vf, char* args){ 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 |