diff options
| -rw-r--r-- | libmpcodecs/vf.c | 14 | ||||
| -rw-r--r-- | libmpcodecs/vf.h | 1 | ||||
| -rw-r--r-- | libmpcodecs/vf_tfields.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/vf_yadif.c | 2 |
4 files changed, 4 insertions, 19 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index cd181156f4..37ada3c59e 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -578,12 +578,6 @@ int vf_output_queued_frame(vf_instance_t *vf) tmp = last->continue_buffered_image; last->continue_buffered_image = NULL; ret = tmp(last); - if (ret > 0) { - vf->control(vf, VFCTRL_DRAW_OSD, NULL); -#ifdef CONFIG_ASS - vf->control(vf, VFCTRL_DRAW_EOSD, NULL); -#endif - } if (ret) return ret; } @@ -661,14 +655,6 @@ int vf_next_control(struct vf_instance_s* vf, int request, void* data){ return vf->next->control(vf->next,request,data); } -void vf_extra_flip(struct vf_instance_s* vf) { - vf_next_control(vf, VFCTRL_DRAW_OSD, NULL); -#ifdef CONFIG_ASS - vf_next_control(vf, VFCTRL_DRAW_EOSD, NULL); -#endif - vf_next_control(vf, VFCTRL_FLIP_PAGE, NULL); -} - int vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt){ int flags=vf->next->query_format(vf->next,fmt); if(flags) flags|=vf->default_caps; diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h index a2617ff164..27a48eadf2 100644 --- a/libmpcodecs/vf.h +++ b/libmpcodecs/vf.h @@ -112,7 +112,6 @@ int vf_next_config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt); int vf_next_control(struct vf_instance_s* vf, int request, void* data); -void vf_extra_flip(struct vf_instance_s* vf); 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, double pts); void vf_next_draw_slice (struct vf_instance_s* vf, unsigned char** src, int* stride, int w,int h, int x, int y); diff --git a/libmpcodecs/vf_tfields.c b/libmpcodecs/vf_tfields.c index df341cea59..e70799a0fa 100644 --- a/libmpcodecs/vf_tfields.c +++ b/libmpcodecs/vf_tfields.c @@ -365,7 +365,7 @@ static int continue_buffered_image(struct vf_instance_s *vf) if (correct_pts) break; else - if (!i) vf_extra_flip(vf); + if (!i) vf_next_control(vf, VFCTRL_FLIP_PAGE, NULL); } break; case 1: @@ -395,7 +395,7 @@ static int continue_buffered_image(struct vf_instance_s *vf) if (correct_pts) break; else - if (!i) vf_extra_flip(vf); + if (!i) vf_next_control(vf, VFCTRL_FLIP_PAGE, NULL); } break; case 2: @@ -421,7 +421,7 @@ static int continue_buffered_image(struct vf_instance_s *vf) if (correct_pts) break; else - if (!i) vf_extra_flip(vf); + if (!i) vf_next_control(vf, VFCTRL_FLIP_PAGE, NULL); } break; } diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c index a8328d3f2a..971ad988e2 100644 --- a/libmpcodecs/vf_yadif.c +++ b/libmpcodecs/vf_yadif.c @@ -440,7 +440,7 @@ static int continue_buffered_image(struct vf_instance_s *vf) if (correct_pts) break; if(i<(vf->priv->mode&1)) - vf_extra_flip(vf); + vf_next_control(vf, VFCTRL_FLIP_PAGE, NULL); } vf->priv->buffered_i = 1; return ret; |