[MPlayer-cvslog] CVS: main mplayer.c, 1.853, 1.854 mencoder.c, 1.291, 1.292

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv14907

Modified Files:
	mplayer.c mencoder.c 
Log Message:
Do not count skipped/broken frames when using -frames


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -r1.853 -r1.854
--- mplayer.c	30 Jun 2005 10:22:09 -0000	1.853
+++ mplayer.c	3 Jul 2005 10:09:09 -0000	1.854
@@ -2240,11 +2240,6 @@
 while(!eof){
     float aq_sleep_time=0;
 
-    if(play_n_frames>=0){
-      --play_n_frames;
-      if(play_n_frames<0) eof = PT_NEXT_ENTRY;
-    }
-
 /*========================== PLAY AUDIO ============================*/
 
 while(sh_audio){
@@ -2521,6 +2516,11 @@
 		/* printf ("PANIC: too slow frame (%.3f)!\n", j); */
 
 	   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;
+	   }
+
 //        usec_sleep(50000); // test only!
 	   t2=GetTimer()-t2;
 	   tt = t2*0.000001f;

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- mencoder.c	2 Jul 2005 19:00:12 -0000	1.291
+++ mencoder.c	3 Jul 2005 10:09:09 -0000	1.292
@@ -1273,6 +1273,8 @@
     if (sh_video->vf_inited < 0) mencoder_exit(1, NULL);
     
     if(!blit_frame){
+      if (play_n_frames >= 0)
+        play_n_frames++;
       badframes++;
       if(skip_flag<=0){
 	// unwanted skipping of a frame, what to do?