Mercurial > mplayer.hg

changeset 8254:772d6d27fd66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
author michael
date Sat, 23 Nov 2002 10:58:14 +0000
parents 7eb9d868f2e9
children 97e8dfe61ab1
files divx4_vbr.c input/input.c liba52/imdct.c liba52/imdct_3dnow.h libmpcodecs/Makefile libmpcodecs/vd_huffyuv.c libmpdemux/audio_in.c libmpdemux/demux_asf.c libmpdemux/demux_avi.c libmpdemux/demux_mov.c libmpdemux/demux_mpg.c libmpdemux/demux_pva.c libmpdemux/demux_real.c libmpdemux/demux_viv.c libmpdemux/tv.c libmpdemux/tvi_v4l.c libmpdvdkit2/nav_read.c libvo/geometry.c libvo/vo_gl2.c libvo/vo_xvidix.c libvo/vosub_vidix.c mplayer.c postproc/postprocess_template.c postproc/swscale_template.c
diffstat 24 files changed, 50 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/divx4_vbr.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/divx4_vbr.c	Sat Nov 23 10:58:14 2002 +0000
@@ -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",
--- a/input/input.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/input/input.c	Sat Nov 23 10:58:14 2002 +0000
@@ -689,7 +689,7 @@
 
 void
 mp_input_add_cmd_filter(mp_input_cmd_filter func, void* ctx) {
-  mp_cmd_filter_t* filter = malloc(sizeof(mp_cmd_filter_t)), *prev;
+  mp_cmd_filter_t* filter = malloc(sizeof(mp_cmd_filter_t))/*, *prev*/;
 
   filter->filter = func;
   filter->ctx = ctx;
--- a/liba52/imdct.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/liba52/imdct.c	Sat Nov 23 10:58:14 2002 +0000
@@ -193,16 +193,19 @@
 void
 imdct_do_512(sample_t data[],sample_t delay[], sample_t bias)
 {
-    int i,k;
+    int i;
+#ifndef USE_AC3_C
+	int k;
     int p,q;
     int m;
     int two_m;
     int two_m_plus_one;
 
+    sample_t tmp_b_i;
+    sample_t tmp_b_r;
+#endif
     sample_t tmp_a_i;
     sample_t tmp_a_r;
-    sample_t tmp_b_i;
-    sample_t tmp_b_r;
 
     sample_t *data_ptr;
     sample_t *delay_ptr;
@@ -401,16 +404,16 @@
 void
 imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
 {
-    int i,k;
-    int p,q;
+/*	int i,k;
+    int p,q;*/
     int m;
     int two_m;
     int two_m_plus_one;
 
-    sample_t tmp_a_i;
+/*  sample_t tmp_a_i;
     sample_t tmp_a_r;
     sample_t tmp_b_i;
-    sample_t tmp_b_r;
+    sample_t tmp_b_r;*/
 
     sample_t *data_ptr;
     sample_t *delay_ptr;
--- a/liba52/imdct_3dnow.h	Sat Nov 23 01:29:47 2002 +0000
+++ b/liba52/imdct_3dnow.h	Sat Nov 23 10:58:14 2002 +0000
@@ -322,7 +322,8 @@
 #endif
 (sample_t data[],sample_t delay[], sample_t bias)
 {
-    int i,k;
+    int i;
+/*	int k;
     int p,q;
     int m;
     int two_m;
@@ -331,7 +332,7 @@
     sample_t tmp_a_i;
     sample_t tmp_a_r;
     sample_t tmp_b_i;
-    sample_t tmp_b_r;
+    sample_t tmp_b_r;*/
 
     sample_t *data_ptr;
     sample_t *delay_ptr;
--- a/libmpcodecs/Makefile	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpcodecs/Makefile	Sat Nov 23 10:58:14 2002 +0000
@@ -37,7 +37,7 @@
 SRCS2=$(ENCODER_SRCS)
 OBJS2=$(SRCS2:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC)
+CFLAGS  = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) -D_GNU_SOURCE
 
 .SUFFIXES: .c .o
 
--- a/libmpcodecs/vd_huffyuv.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpcodecs/vd_huffyuv.c	Sat Nov 23 10:58:14 2002 +0000
@@ -595,7 +595,7 @@
 {
 	mp_image_t* mpi;
 	int pixel_ptr;
-	unsigned char y1, y2, u, v, r, g, b, a;
+	unsigned char y1, y2, u, v, r, g, b/*, a*/;
 	unsigned char left_y, left_u, left_v, left_r, left_g, left_b;
 	unsigned char tmp, mi, mx, med;
 	unsigned char *swap;
--- a/libmpdemux/audio_in.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdemux/audio_in.c	Sat Nov 23 10:58:14 2002 +0000
@@ -109,7 +109,9 @@
 
 int audio_in_set_device(audio_in_t *ai, char *device)
 {
+#ifdef HAVE_ALSA9	  
     int i;
+#endif
     if (ai->setup) return -1;
     switch (ai->type) {
 #ifdef HAVE_ALSA9	  
--- a/libmpdemux/demux_asf.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdemux/demux_asf.c	Sat Nov 23 10:58:14 2002 +0000
@@ -397,11 +397,11 @@
 }
 
 int demux_asf_control(demuxer_t *demuxer,int cmd, void *arg){
-    demux_stream_t *d_audio=demuxer->audio;
+/*  demux_stream_t *d_audio=demuxer->audio;
     demux_stream_t *d_video=demuxer->video;
     sh_audio_t *sh_audio=d_audio->sh;
     sh_video_t *sh_video=d_video->sh;
-
+*/
     switch(cmd) {
 	case DEMUXER_CTRL_GET_TIME_LENGTH:
 	    *((unsigned long *)arg)=(unsigned long)(asf_movielength);
--- a/libmpdemux/demux_avi.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdemux/demux_avi.c	Sat Nov 23 10:58:14 2002 +0000
@@ -788,9 +788,9 @@
 
 int demux_avi_control(demuxer_t *demuxer,int cmd, void *arg){
     avi_priv_t *priv=demuxer->priv;
-    demux_stream_t *d_audio=demuxer->audio;
+/*    demux_stream_t *d_audio=demuxer->audio;*/
     demux_stream_t *d_video=demuxer->video;
-    sh_audio_t *sh_audio=d_audio->sh;
+/*    sh_audio_t *sh_audio=d_audio->sh;*/
     sh_video_t *sh_video=d_video->sh;
 
 
--- a/libmpdemux/demux_mov.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdemux/demux_mov.c	Sat Nov 23 10:58:14 2002 +0000
@@ -527,7 +527,7 @@
 		break;
 	    }
 	    case MOV_FOURCC('s','t','t','s'): {
-		int temp=stream_read_dword(demuxer->stream);
+		stream_read_dword(demuxer->stream);
 		int len=stream_read_dword(demuxer->stream);
 		int i;
 		unsigned int pts=0;
@@ -582,7 +582,7 @@
 		break;
 	    }
 	    case MOV_FOURCC('s','t','c','o'): {
-		int temp=stream_read_dword(demuxer->stream);
+		stream_read_dword(demuxer->stream);
 		int len=stream_read_dword(demuxer->stream);
 		int i;
 		mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*sChunk offset table! (%d chunks)\n",level,"",len);
@@ -596,7 +596,7 @@
 		break;
 	    }
 	    case MOV_FOURCC('c','o','6','4'): {
-		int temp=stream_read_dword(demuxer->stream);
+		stream_read_dword(demuxer->stream);
 		int len=stream_read_dword(demuxer->stream);
 		int i;
 		mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*s64bit chunk offset table! (%d chunks)\n",level,"",len);
--- a/libmpdemux/demux_mpg.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdemux/demux_mpg.c	Sat Nov 23 10:58:14 2002 +0000
@@ -406,9 +406,9 @@
 }
 
 int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){
-    demux_stream_t *d_audio=demuxer->audio;
+/*    demux_stream_t *d_audio=demuxer->audio;*/
     demux_stream_t *d_video=demuxer->video;
-    sh_audio_t *sh_audio=d_audio->sh;
+/*    sh_audio_t *sh_audio=d_audio->sh;*/
     sh_video_t *sh_video=d_video->sh;
 
     switch(cmd) {
--- a/libmpdemux/demux_pva.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdemux/demux_pva.c	Sat Nov 23 10:58:14 2002 +0000
@@ -280,7 +280,9 @@
 	uint16_t pack_size;
 	off_t next_offset,pva_payload_start;
 	unsigned char buffer[256];
+#ifndef PVA_NEW_PREBYTES_CODE
 	demux_packet_t * dp; 	//hack to deliver the preBytes (see PVA doc)
+#endif
 	pva_priv_t * priv=(pva_priv_t *) d->priv;
 
 	
--- a/libmpdemux/demux_real.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdemux/demux_real.c	Sat Nov 23 10:58:14 2002 +0000
@@ -354,7 +354,9 @@
     int len;
     int timestamp;
     int stream_id;
+#ifdef CRACK_MATRIX
     int i;
+#endif
     int flags;
     int version;
     int reserved;
--- a/libmpdemux/demux_viv.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdemux/demux_viv.c	Sat Nov 23 10:58:14 2002 +0000
@@ -708,7 +708,7 @@
 		if (vivo_param_bytesperblock != -1)
 		    sh->wf->nBlockAlign = vivo_param_bytesperblock;
 		
-sound_ok:
+/*sound_ok:*/
 		/* insert as stream */
 		demuxer->audio->sh=sh;
 		sh->ds=demuxer->audio;
--- a/libmpdemux/tv.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdemux/tv.c	Sat Nov 23 10:58:14 2002 +0000
@@ -29,6 +29,7 @@
 #include "stheader.h"
 
 #include "../libao2/afmt.h"
+#include "../libao2/audio_out.h"
 #include "../libvo/img_format.h"
 #include "../libvo/fastmemcpy.h"
 
--- a/libmpdemux/tvi_v4l.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdemux/tvi_v4l.c	Sat Nov 23 10:58:14 2002 +0000
@@ -1324,7 +1324,7 @@
     priv_t *priv = (priv_t*)data;
     struct timeval tv;
     int i, audio_skew_ptr = 0;
-    long long tmp, current_time, prev_skew = 0;
+    long long /*tmp,*/ current_time, prev_skew = 0;
 
     pthread_mutex_lock(&priv->audio_starter);
 
--- a/libmpdvdkit2/nav_read.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libmpdvdkit2/nav_read.c	Sat Nov 23 10:58:14 2002 +0000
@@ -95,7 +95,7 @@
   /* pci hli btnit */
   for(i = 0; i < pci->hli.hl_gi.btngr_ns; i++) {
     for(j = 0; j < (36 / pci->hli.hl_gi.btngr_ns); j++) {
-      int n = (36 / pci->hli.hl_gi.btngr_ns) * i + j;
+/*      int n = (36 / pci->hli.hl_gi.btngr_ns) * i + j;*/
       assert(pci->hli.btnit[n].zero1 == 0);
       assert(pci->hli.btnit[n].zero2 == 0);
       assert(pci->hli.btnit[n].zero3 == 0);
--- a/libvo/geometry.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libvo/geometry.c	Sat Nov 23 10:58:14 2002 +0000
@@ -2,7 +2,7 @@
 
 #include "geometry.h"
 #include "../mp_msg.h"
-// #include "../mplayer.h" /* exit_player() */
+#include "../mplayer.h" /* exit_player() */
 #include <string.h>
 #include <stdlib.h> /* strtol */
 
--- a/libvo/vo_gl2.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libvo/vo_gl2.c	Sat Nov 23 10:58:14 2002 +0000
@@ -472,7 +472,7 @@
 static void drawTextureDisplay ()
 {
   struct TexSquare *square;
-  int x, y, xoff=0, yoff=0, wd, ht;
+  int x, y/*, xoff=0, yoff=0, wd, ht*/;
   GLenum err;
 
   glColor3f(1.0,1.0,1.0);
--- a/libvo/vo_xvidix.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libvo/vo_xvidix.c	Sat Nov 23 10:58:14 2002 +0000
@@ -32,6 +32,7 @@
 
 #include "vosub_vidix.h"
 #include "../vidix/vidixlib.h"
+#include "../mplayer.h" /* exit_player() */
 
 #ifdef HAVE_NEW_GUI
 #include "../Gui/interface.h"
--- a/libvo/vosub_vidix.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/libvo/vosub_vidix.c	Sat Nov 23 10:58:14 2002 +0000
@@ -49,7 +49,7 @@
 static vidix_fourcc_t	  vidix_fourcc;
 static vo_functions_t *   vo_server;
 static vidix_yuv_t	  dstrides;
-static uint32_t (*server_control)(uint32_t request, void *data, ...);
+/*static uint32_t (*server_control)(uint32_t request, void *data, ...);*/
 
 static int  vidix_get_video_eq(vidix_video_eq_t *info);
 static int  vidix_set_video_eq(const vidix_video_eq_t *info);
--- a/mplayer.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/mplayer.c	Sat Nov 23 10:58:14 2002 +0000
@@ -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
--- a/postproc/postprocess_template.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/postproc/postprocess_template.c	Sat Nov 23 10:58:14 2002 +0000
@@ -2658,7 +2658,10 @@
 	int black=0, white=255; // blackest black and whitest white in the picture
 	int QPCorrecture= 256*256;
 
-	int copyAhead, i;
+	int copyAhead;
+#ifdef HAVE_MMX
+	int i;
+#endif
 
 	//FIXME remove
 	uint64_t * const yHistogram= c.yHistogram;
--- a/postproc/swscale_template.c	Sat Nov 23 01:29:47 2002 +0000
+++ b/postproc/swscale_template.c	Sat Nov 23 10:58:14 2002 +0000
@@ -1256,7 +1256,9 @@
 static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t *uvbuf0, uint16_t *uvbuf1,
 			    uint8_t *dest, int dstW, int uvalpha, int dstFormat, int flags, int y)
 {
+#ifdef HAVE_MMX
 	int uvalpha1=uvalpha^4095;
+#endif
 	const int yalpha1=0;
 	int i;