mirror of
https://github.com/mpv-player/mpv
synced 2025-04-01 14:50:07 +00:00
Revert Michael's VFCTRL_FLIP_PAGE changes ("svn merge -r 18781:18779 .")
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18782 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
a8d08eee90
commit
c22ccbb864
@ -73,7 +73,6 @@ struct vf_priv_s {
|
||||
int frame_step;
|
||||
/* Only I-Frame (2), print on I-Frame (1) */
|
||||
int dump_iframe;
|
||||
int last_skip;
|
||||
};
|
||||
|
||||
/* Filter handler */
|
||||
@ -109,8 +108,6 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
|
||||
/* Increment current frame */
|
||||
++priv->frame_cur;
|
||||
|
||||
priv->last_skip= skip;
|
||||
|
||||
if (skip == 0) {
|
||||
/* Get image, export type (we don't modify tghe image) */
|
||||
dmpi=vf_get_image(vf->next, mpi->imgfmt,
|
||||
@ -136,13 +133,6 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int control(struct vf_instance_s* vf, int request, void* data){
|
||||
if(request == VFCTRL_FLIP_PAGE && vf->priv->last_skip){
|
||||
return CONTROL_TRUE;
|
||||
}
|
||||
return vf_next_control(vf,request,data);
|
||||
}
|
||||
|
||||
static void uninit(struct vf_instance_s* vf)
|
||||
{
|
||||
/* Free private data */
|
||||
@ -155,7 +145,6 @@ static int open(vf_instance_t *vf, char* args)
|
||||
struct vf_priv_s *p;
|
||||
|
||||
vf->put_image = put_image;
|
||||
vf->control= control;
|
||||
vf->uninit = uninit;
|
||||
vf->default_reqs = VFCAP_ACCEPT_STRIDE;
|
||||
vf->priv = p = calloc(1, sizeof(struct vf_priv_s));
|
||||
|
@ -3940,11 +3940,7 @@ if(time_frame>0.001 && !(vo_flags&256)){
|
||||
too_slow_frame_cnt++;
|
||||
/* printf ("PANIC: too slow frame (%.3f)!\n", j); */
|
||||
|
||||
if(vo_config_count){
|
||||
if(CONTROL_OK!=((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_FLIP_PAGE, 0))
|
||||
video_out->flip_page();
|
||||
}
|
||||
|
||||
if(vo_config_count) video_out->flip_page();
|
||||
if (play_n_frames >= 0) {
|
||||
--play_n_frames;
|
||||
if (play_n_frames <= 0) eof = PT_NEXT_ENTRY;
|
||||
|
Loading…
Reference in New Issue
Block a user