[Mplayer-cvslog] CVS: main configure,1.141,1.142 demux_avi.c,1.22,1.23 mplayer.c,1.221,1.222

[Folke Ashberg]

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

Modified Files:
	configure demux_avi.c mplayer.c 
Log Message:
moved some stdout to stderr

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- configure	15 Aug 2001 19:43:31 -0000	1.141
+++ configure	16 Aug 2001 16:14:00 -0000	1.142
@@ -1892,6 +1892,11 @@
 #define USE_OSD
 #define USE_SUB
 
+#ifndef USE_OSD
+/* can't support subtite without osd functionality */
+#undef USE_SUB
+#endif
+
 /* Common data directory (for fonts, etc) */
 #define DATADIR "$_datadir"
 

Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/demux_avi.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- demux_avi.c	16 Aug 2001 01:03:51 -0000	1.22
+++ demux_avi.c	16 Aug 2001 16:14:00 -0000	1.23
@@ -69,7 +69,7 @@
           if(priv->pts_has_video){
 	      // we have video pts now
 	      float delay=(float)priv->pts_corr_bytes/((sh_audio_t*)(ds->sh))->wf->nAvgBytesPerSec;
-	      printf("XXX initial  v_pts=%5.3f  a_pos=%d (%5.3f) \n",priv->avi_audio_pts,priv->pts_corr_bytes,delay);
+	      fprintf(stderr,"XXX initial  v_pts=%5.3f  a_pos=%d (%5.3f) \n",priv->avi_audio_pts,priv->pts_corr_bytes,delay);
 	      //priv->pts_correction=-priv->avi_audio_pts+delay;
 	      priv->pts_correction=delay-priv->avi_audio_pts;
 	      priv->avi_audio_pts+=priv->pts_correction;
@@ -523,7 +523,7 @@
       priv->avi_video_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
       d_video->pos=video_chunk_pos;
       
-      printf("V_SEEK:  pack=%d  pts=%5.3f  chunk=%d  \n",d_video->pack_no,priv->avi_video_pts,video_chunk_pos);
+      fprintf(stderr, "V_SEEK:  pack=%d  pts=%5.3f  chunk=%d  \n",d_video->pack_no,priv->avi_video_pts,video_chunk_pos);
 
 // ------------ STEP 2: seek audio, find the right chunk & pos ------------
 

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- mplayer.c	16 Aug 2001 09:25:31 -0000	1.221
+++ mplayer.c	16 Aug 2001 16:14:00 -0000	1.222
@@ -1455,7 +1455,7 @@
 #endif
 
   if(osd_function==OSD_PAUSE){
-      printf("\n------ PAUSED -------\r");fflush(stdout);
+      fprintf(stderr,"\n------ PAUSED -------\r");fflush(stderr);
       if (audio_out && sh_audio)
          audio_out->pause();	// pause audio, keep data if possible
 #ifdef HAVE_GUI
@@ -1675,9 +1675,9 @@
 	if(verbose){
 	    float a_pts=d_audio->pts;
             a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
-	    printf("SEEK: A: %5.3f  V: %5.3f  A-V: %5.3f   \n",a_pts,d_video->pts,a_pts-d_video->pts);
+	    fprintf(stderr,"SEEK: A: %5.3f  V: %5.3f  A-V: %5.3f   \n",a_pts,d_video->pts,a_pts-d_video->pts);
 	}
-        printf("A:%6.1f  V:%6.1f  A-V:%7.3f  ct: ?   \r",d_audio->pts,d_video->pts,0.0f);
+        fprintf(stderr, "A:%6.1f  V:%6.1f  A-V:%7.3f  ct: ?   \r",d_audio->pts,d_video->pts,0.0f);
       } else {
         printf("A: ---   V:%6.1f   \r",d_video->pts);
       }