mirror of
https://github.com/mpv-player/mpv
synced 2025-04-11 04:01:31 +00:00
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
This commit is contained in:
parent
e24cd4d942
commit
1d63493c0f
@ -137,7 +137,6 @@ vf_instance_t* vf_open_filter(vf_instance_t* next, char *name, char *args){
|
|||||||
vf->control=vf_next_control;
|
vf->control=vf_next_control;
|
||||||
vf->query_format=vf_next_query_format;
|
vf->query_format=vf_next_query_format;
|
||||||
vf->put_image=vf_next_put_image;
|
vf->put_image=vf_next_put_image;
|
||||||
vf->uninit=vf_next_uninit;
|
|
||||||
if(vf->info->open(vf,args)>0) return vf; // Success!
|
if(vf->info->open(vf,args)>0) return vf; // Success!
|
||||||
free(vf);
|
free(vf);
|
||||||
mp_msg(MSGT_VFILTER,MSGL_ERR,"Couldn't open video filter '%s'\n",name);
|
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);
|
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){
|
vf_instance_t* append_filters(vf_instance_t* last){
|
||||||
|
@ -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_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_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_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);
|
vf_instance_t* append_filters(vf_instance_t* last);
|
||||||
|
|
||||||
|
|
||||||
|
@ -57,10 +57,6 @@ static void draw_slice(struct vf_instance_s* vf,
|
|||||||
video_out->draw_slice(src,stride,w,h,x,y);
|
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){
|
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->get_image=get_image;
|
||||||
vf->put_image=put_image;
|
vf->put_image=put_image;
|
||||||
vf->draw_slice=draw_slice;
|
vf->draw_slice=draw_slice;
|
||||||
vf->uninit=uninit;
|
|
||||||
vf->priv=(void*)args; // video_out
|
vf->priv=(void*)args; // video_out
|
||||||
if(!video_out) return 0; // no vo ?
|
if(!video_out) return 0; // no vo ?
|
||||||
// if(video_out->preinit(args)) return 0; // preinit failed
|
// if(video_out->preinit(args)) return 0; // preinit failed
|
||||||
|
Loading…
Reference in New Issue
Block a user