[Mplayer-cvslog] CVS: main cfg-common.h,1.45,1.46 mencoder.c,1.136,1.137 mplayer.c,1.518,1.519

[Alex Beregszaszi]

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

Modified Files:
	cfg-common.h mencoder.c mplayer.c 
Log Message:
-frames 0 fix, multifile frames support by tibcu

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cfg-common.h	25 Jun 2002 23:33:46 -0000	1.45
+++ cfg-common.h	28 Jun 2002 17:13:18 -0000	1.46
@@ -49,7 +49,7 @@
 // ------------------------- demuxer options --------------------
 
 	// number of frames to play/convert
-	{"frames", &play_n_frames, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
+	{"frames", &play_n_frames_mf, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
 
 	// seek to byte/seconds position
 	{"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- mencoder.c	27 Jun 2002 19:33:28 -0000	1.136
+++ mencoder.c	28 Jun 2002 17:13:18 -0000	1.137
@@ -153,6 +153,7 @@
 int pass_working=0;
 
 static int play_n_frames=-1;
+static int play_n_frames_mf=-1;
 
 #include "libvo/font_load.h"
 #include "libvo/sub.h"
@@ -799,6 +800,8 @@
 	audio_preload = 0.0;
 	default_max_pts_correction = 0;
 	}
+
+play_n_frames=play_n_frames_mf;
 
 while(!at_eof){
 

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -r1.518 -r1.519
--- mplayer.c	28 Jun 2002 16:33:46 -0000	1.518
+++ mplayer.c	28 Jun 2002 17:13:18 -0000	1.519
@@ -233,6 +233,7 @@
 static int force_srate=0;
 static int frame_dropping=0; // option  0=no drop  1= drop vo  2= drop decode
 static int play_n_frames=-1;
+static int play_n_frames_mf=-1;
 
 // screen info:
 char* video_driver=NULL; //"mga"; // default
@@ -1489,12 +1490,18 @@
 total_time_usage_start=GetTimer();
 audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
 total_frame_cnt=0; drop_frame_cnt=0; // fix for multifile fps benchmark
+play_n_frames=play_n_frames_mf;
+
+if(play_n_frames==0){
+  eof=PT_NEXT_ENTRY; goto goto_next_file;
+}
+
 while(!eof){
     float aq_sleep_time=0;
 
     if(play_n_frames>=0){
       --play_n_frames;
-      if(play_n_frames<0) eof = PT_NEXT_ENTRY;
+      if(play_n_frames<=0) eof = PT_NEXT_ENTRY;
     }
 
 /*========================== PLAY AUDIO ============================*/