Mercurial > mplayer.hg
changeset 18779:d3b0e55b0c90
Revert Michael's VFCTRL_FLIP_PAGE changes ("svn merge -r 18781:18779 .")
| author | uau |
|---|---|
| date | Wed, 21 Jun 2006 23:50:23 +0000 |
| parents | 8491f306b52f |
| children | 3751ca28809c |
| files | libmpcodecs/vf_framestep.c mplayer.c |
| diffstat | 2 files changed, 1 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vf_framestep.c Wed Jun 21 20:52:07 2006 +0000 +++ b/libmpcodecs/vf_framestep.c Wed Jun 21 23:50:23 2006 +0000 @@ -73,7 +73,6 @@ int frame_step; /* Only I-Frame (2), print on I-Frame (1) */ int dump_iframe; - int last_skip; }; /* Filter handler */ @@ -109,8 +108,6 @@ /* 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 @@ 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 @@ 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));
--- a/mplayer.c Wed Jun 21 20:52:07 2006 +0000 +++ b/mplayer.c Wed Jun 21 23:50:23 2006 +0000 @@ -3940,11 +3940,7 @@ 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;