[MPlayer-cvslog] CVS: main mencoder.c,1.311,1.312

[Rich Felker]

On Fri, Oct 21, 2005 at 11:12:30AM +0200, Diego Biurrun wrote:
> On Thu, Oct 20, 2005 at 11:22:21PM -0400, Rich Felker wrote:
> > On Wed, Oct 19, 2005 at 07:44:29AM +0200, Richard Felker CVS wrote:
> > > +        v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate;
> > > +#if 0
> > >  	if(skip_limit==0){
> > >  	    // skipping not allowed -> write empty frame:
> > >  	    if (!encode_duplicates || !sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_DUPLICATE_FRAME, 0) != CONTROL_TRUE)
> > > @@ -1310,6 +1308,7 @@
> > >  	    // skipping allowed -> skip it and distriubute timer error:
> > >  	    v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate;
> > >  	}
> > > +#endif
> > >        }
> > >      }
> > >  }
> > 
> > Arrg, 100l to me for not noticing this unrelated uncommitted change I
> > had in mencoder.c!!! It's actually correct I think; however it wasn't
> > related. Should I do some sort of reverse, or just leave it, or...?
> 
> I'd say revert and recommit properly.  You can then decide what to do
> with the other change.

But not with cvs admin -o, right?

Rich