diff options
author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-23 10:58:14 +0000 |
---|---|---|
committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-23 10:58:14 +0000 |
commit | 01c201dbe8d6a18634bf86bf4d648344ed496d91 (patch) | |
tree | 572e1a9be9c97f6b46370bd3b8b6ab8e30b2c5f4 /libmpdemux | |
parent | 0f889e9f64dd6f660a2b176b7d35c962f89ba072 (diff) |
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8255 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/audio_in.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_asf.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_avi.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_mov.c | 6 | ||||
-rw-r--r-- | libmpdemux/demux_mpg.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_pva.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_real.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_viv.c | 2 | ||||
-rw-r--r-- | libmpdemux/tv.c | 1 | ||||
-rw-r--r-- | libmpdemux/tvi_v4l.c | 2 |
10 files changed, 18 insertions, 11 deletions
diff --git a/libmpdemux/audio_in.c b/libmpdemux/audio_in.c index dbc8752be5..54ba446dfc 100644 --- a/libmpdemux/audio_in.c +++ b/libmpdemux/audio_in.c @@ -109,7 +109,9 @@ int audio_in_set_channels(audio_in_t *ai, int channels) 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 diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 9d6196dab5..ab860d2e13 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -397,11 +397,11 @@ void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags){ } 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); diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 8406e8f794..8b312a71bf 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -788,9 +788,9 @@ void demux_close_avi(demuxer_t *demuxer) { 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; diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index e8e315061b..03b8ef6408 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -527,7 +527,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak 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 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak 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 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak 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); diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index bdc28fd618..e20307fda7 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -406,9 +406,9 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){ } 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) { diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c index 911e15158e..af6c05951d 100644 --- a/libmpdemux/demux_pva.c +++ b/libmpdemux/demux_pva.c @@ -280,7 +280,9 @@ int pva_get_payload(demuxer_t * d,pva_payload_t * payload) 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; diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 4988cc9633..6e852b62c1 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -354,7 +354,9 @@ int demux_real_fill_buffer(demuxer_t *demuxer) int len; int timestamp; int stream_id; +#ifdef CRACK_MATRIX int i; +#endif int flags; int version; int reserved; diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 9ca575a6c0..1d560451d8 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -708,7 +708,7 @@ if (demuxer->audio->id >= -1){ 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; diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index 5c3b05bb13..2653c364fd 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -29,6 +29,7 @@ int tv_param_on = 0; #include "stheader.h" #include "../libao2/afmt.h" +#include "../libao2/audio_out.h" #include "../libvo/img_format.h" #include "../libvo/fastmemcpy.h" diff --git a/libmpdemux/tvi_v4l.c b/libmpdemux/tvi_v4l.c index 91b3a3ee5a..c77e4e9229 100644 --- a/libmpdemux/tvi_v4l.c +++ b/libmpdemux/tvi_v4l.c @@ -1324,7 +1324,7 @@ static void *audio_grabber(void *data) 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); |