[Mplayer-cvslog] CVS: main/libmpdemux audio_in.c,1.6,1.7 demux_asf.c,1.25,1.26 demux_avi.c,1.51,1.52 demux_mov.c,1.82,1.83 demux_mpg.c,1.45,1.46 demux_pva.c,1.3,1.4 demux_real.c,1.33,1.34 demux_viv.c,1.23,1.24 tv.c,1.39,1.40 tvi_v4l.c,1.40,1.41

[Michael Niedermayer CVS]

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

Modified Files:
	audio_in.c demux_asf.c demux_avi.c demux_mov.c demux_mpg.c 
	demux_pva.c demux_real.c demux_viv.c tv.c tvi_v4l.c 
Log Message:
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)


Index: audio_in.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/audio_in.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- audio_in.c	22 Oct 2002 15:14:30 -0000	1.6
+++ audio_in.c	23 Nov 2002 10:58:08 -0000	1.7
@@ -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	  

Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_asf.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- demux_asf.c	16 Nov 2002 03:42:14 -0000	1.25
+++ demux_asf.c	23 Nov 2002 10:58:08 -0000	1.26
@@ -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);

Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- demux_avi.c	16 Nov 2002 03:42:14 -0000	1.51
+++ demux_avi.c	23 Nov 2002 10:58:08 -0000	1.52
@@ -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;
 
 

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- demux_mov.c	11 Nov 2002 23:46:27 -0000	1.82
+++ demux_mov.c	23 Nov 2002 10:58:08 -0000	1.83
@@ -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);

Index: demux_mpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- demux_mpg.c	16 Nov 2002 03:42:14 -0000	1.45
+++ demux_mpg.c	23 Nov 2002 10:58:08 -0000	1.46
@@ -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) {

Index: demux_pva.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_pva.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demux_pva.c	7 Oct 2002 22:13:34 -0000	1.3
+++ demux_pva.c	23 Nov 2002 10:58:08 -0000	1.4
@@ -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;
 
 	

Index: demux_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- demux_real.c	6 Nov 2002 23:54:26 -0000	1.33
+++ demux_real.c	23 Nov 2002 10:58:08 -0000	1.34
@@ -354,7 +354,9 @@
     int len;
     int timestamp;
     int stream_id;
+#ifdef CRACK_MATRIX
     int i;
+#endif
     int flags;
     int version;
     int reserved;

Index: demux_viv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_viv.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- demux_viv.c	22 Sep 2002 02:33:26 -0000	1.23
+++ demux_viv.c	23 Nov 2002 10:58:08 -0000	1.24
@@ -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;

Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- tv.c	6 Nov 2002 23:54:26 -0000	1.39
+++ tv.c	23 Nov 2002 10:58:08 -0000	1.40
@@ -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"
 

Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- tvi_v4l.c	8 Nov 2002 22:05:39 -0000	1.40
+++ tvi_v4l.c	23 Nov 2002 10:58:08 -0000	1.41
@@ -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);