[Mplayer-cvslog] CVS: main mplayer.c,1.613,1.614 divx4_vbr.c,1.7,1.8

[Michael Niedermayer CVS]

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

Modified Files:
	mplayer.c divx4_vbr.c 
Log Message:
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.613
retrieving revision 1.614
diff -u -r1.613 -r1.614
--- mplayer.c	16 Nov 2002 03:42:13 -0000	1.613
+++ mplayer.c	23 Nov 2002 10:57:44 -0000	1.614
@@ -1368,7 +1368,7 @@
 float AV_delay=0; // average of A-V timestamp differences
 double vdecode_time;
 unsigned int lastframeout_ts=0;
-float time_frame_corr_avg=0;
+/*float time_frame_corr_avg=0;*/ /* unused */
 
 float next_frame_time=0;
 int frame_time_remaining=0; // flag

Index: divx4_vbr.c
===================================================================
RCS file: /cvsroot/mplayer/main/divx4_vbr.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- divx4_vbr.c	23 Sep 2002 19:02:21 -0000	1.7
+++ divx4_vbr.c	23 Nov 2002 10:57:44 -0000	1.8
@@ -62,7 +62,7 @@
 
 static int m_iCount;
 static int m_iQuant;
-static int m_iCrispness;
+/*static int m_iCrispness;*/
 static short m_bDrop;
 static float m_fQuant;
 
@@ -178,7 +178,7 @@
 
 	
 		while(!feof(m_pFile)) 
-      {  fscanf(m_pFile, "Frame %d: intra %d, quant %d, texture %d, motion %d, total %d\n",
+      {  fscanf(m_pFile, "Frame %d: intra %hd, quant %d, texture %d, motion %d, total %d\n",
          &iNumFrames, &(vFrame.is_key_frame), &(vFrame.quant), &(vFrame.text_bits), &(vFrame.motion_bits), &(vFrame.total_bits));
 
                 vFrame.total_bits+=vFrame.text_bits*(qual_multiplier-1);
@@ -208,7 +208,7 @@
 	   fseek(m_pFile, lFrameStart, SEEK_SET);		// start again
 		
 		for (i=0;i<iNumFrames;i++)
-		{  fscanf(m_pFile, "Frame %d: intra %d, quant %d, texture %d, motion %d, total %d\n",
+		{  fscanf(m_pFile, "Frame %d: intra %hd, quant %d, texture %d, motion %d, total %d\n",
          &dummy, &(m_vFrames[i].is_key_frame), &(m_vFrames[i].quant), 
 			&(m_vFrames[i].text_bits), &(m_vFrames[i].motion_bits), 
 			&(m_vFrames[i].total_bits));
@@ -227,7 +227,7 @@
 
 	if(desired_bits<=non_text_bits)
 	{
-		char s[200];
+/*		char s[200];*/
 		printf("Specified bitrate is too low for this clip.\n"
 			"Minimum possible bitrate for the clip is %.0f kbps. Overriding\n"
 			"user-specified value.\n",