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

Rich Felker dalias at aerifal.cx
Fri Oct 21 05:22:21 CEST 2005


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...?

Rich




More information about the MPlayer-cvslog mailing list