[xine-cvs] CVS: xine-lib/src/demuxers demux_mpeg_block.c,1.151,1.152

[Rocky B. <ro...@us...>]

Update of /cvsroot/xine/xine-lib/src/demuxers
In directory sc8-pr-cvs1:/tmp/cvs-serv1933

Modified Files:
	demux_mpeg_block.c 
Log Message:
Ooops meant to protect with "LOG"


Index: demux_mpeg_block.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_mpeg_block.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- demux_mpeg_block.c	3 Jan 2003 13:21:19 -0000	1.151
+++ demux_mpeg_block.c	3 Jan 2003 13:32:56 -0000	1.152
@@ -638,6 +638,7 @@
   return this->status;
 }
 
+#ifdef ESTIMATE_RATE_FIXED
 /*! 
    Estimate bitrate by looking inside the MPEG file for presentation 
    time stamps (PTS) and computing how far apart these are 
@@ -798,6 +799,7 @@
   return rate;
   
 }
+#endif /*ESTIMATE_RATE_FIXED*/
 
 static void demux_mpeg_block_dispose (demux_plugin_t *this_gen) {
 
@@ -856,13 +858,13 @@
   
   xine_demux_control_start(this->stream);
   
-  if (!this->rate) {
-#ifdef ESITMATE_RATE_FIXED
+#ifdef USE_ILL_ADVISED_ESTIMATE_RATE_INITIALLY
+  if (!this->rate) 
     this->rate = demux_mpeg_block_estimate_rate (this);
 #else 
-    this->rate = 0;
+  /* Set to Use rate given in by stream initially. */
+  this->rate = 0; 
 #endif
-  }
   
   if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) {
     
@@ -941,12 +943,17 @@
 
     strncpy (this->cur_mrl, input->get_mrl(input), 256);
 
+#ifdef LOG
     printf ("demux_mpeg_block: mrl %s is new\n",
 	    this->cur_mrl);
+#endif
 
   } else
+#ifdef LOG    
     printf ("demux_mpeg_block: mrl %s is known, bitrate: %d\n",
-	    this->cur_mrl, this->rate * 50 * 8);
+	    this->cur_mrl, this->rate * 50 * 8)
+#endif
+      ;
 }
 
 static int demux_mpeg_block_get_stream_length (demux_plugin_t *this_gen) {