[Mplayer-cvslog] CVS: main mencoder.c,1.194,1.195

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv11085

Modified Files:
	mencoder.c 
Log Message:
"MPlayer does the right thing, presents frame 9 for 1.1 seconds, and continues
with frame 20. MEncoder calculates the right "frame_time", but duplicates the
frame following the gap, i.e. frame 20 is presented for 1.1 seconds."
patch by Jan Kritzner <kritzner at i4.informatik.rwth-aachen.de>


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- mencoder.c	27 Dec 2002 22:43:15 -0000	1.194
+++ mencoder.c	28 Dec 2002 12:51:05 -0000	1.195
@@ -1017,6 +1017,8 @@
     if(in_size<0){ at_eof=1; break; }
     sh_video->timer+=frame_time; ++decoded_frameno;
 
+    v_timer_corr-=frame_time-(float)mux_v->h.dwScale/mux_v->h.dwRate;
+
 if(demuxer2){	// 3-pass encoding, read control file (frameno.avi)
     // find our frame:
 	while(next_frameno<decoded_frameno){
@@ -1069,8 +1071,6 @@
   }
 
 } // demuxer2
-
-v_timer_corr-=frame_time-(float)mux_v->h.dwScale/mux_v->h.dwRate;
 
 ptimer_start = GetTimerMS();