summaryrefslogtreecommitdiffstats
path: root/demux_avi.c
diff options
context:
space:
mode:
authorszabii <szabii@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-23 22:33:06 +0000
committerszabii <szabii@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-23 22:33:06 +0000
commit63959d55d0e0c230449e87f6934a9b682a629b3c (patch)
tree26f98e3db0b43fadd0045c676c477013f193d726 /demux_avi.c
parent6d8b5b0f6d5ef5aa0b1d5cd0ebd322b1c2d1d54d (diff)
downloadmpv-63959d55d0e0c230449e87f6934a9b682a629b3c.tar.bz2
mpv-63959d55d0e0c230449e87f6934a9b682a629b3c.tar.xz
some warnings have gone
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@601 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'demux_avi.c')
-rw-r--r--demux_avi.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/demux_avi.c b/demux_avi.c
index 8db141bc52..664a3f000f 100644
--- a/demux_avi.c
+++ b/demux_avi.c
@@ -52,7 +52,7 @@ demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){
}
if(id!=mmioFOURCC('J','U','N','K')){
// unknown
- if(verbose>=2) printf("Unknown chunk: %.4s (%X)\n",&id,id);
+ if(verbose>=2) printf("Unknown chunk: %.4s (%X)\n",(char *) &id,id);
}
return NULL;
}
@@ -139,7 +139,7 @@ do{
continue;
}
if(!demux_avi_select_stream(demux,idx->ckid)){
- if(verbose>2) printf("Skip chunk %.4s (0x%X) \n",&idx->ckid,idx->ckid);
+ if(verbose>2) printf("Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid);
continue; // skip this chunk
}
@@ -156,14 +156,14 @@ do{
stream_seek(demux->stream,pos);
id=stream_read_dword_le(demux->stream);
if(id!=idx->ckid){
- printf("ChunkID mismatch! raw=%.4s idx=%.4s \n",&id,&idx->ckid);
+ printf("ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid);
continue;
}
len=stream_read_dword_le(demux->stream);
// if((len&(~1))!=(idx->dwChunkLength&(~1))){
// if((len)!=(idx->dwChunkLength)){
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
- printf("ChunkSize mismatch! raw=%d idx=%d \n",len,idx->dwChunkLength);
+ printf("ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
continue;
}
} else {
@@ -214,7 +214,7 @@ do{
continue;
}
if(ds && demux_avi_select_stream(demux,idx->ckid)!=ds){
- if(verbose>2) printf("Skip chunk %.4s (0x%X) \n",&idx->ckid,idx->ckid);
+ if(verbose>2) printf("Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid);
continue; // skip this chunk
}
@@ -235,14 +235,14 @@ do{
if(stream_eof(demux->stream)) return 0;
if(id!=idx->ckid){
- printf("ChunkID mismatch! raw=%.4s idx=%.4s \n",&id,&idx->ckid);
+ printf("ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid);
continue;
}
len=stream_read_dword_le(demux->stream);
// if((len&(~1))!=(idx->dwChunkLength&(~1))){
// if((len)!=(idx->dwChunkLength)){
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
- printf("ChunkSize mismatch! raw=%d idx=%d \n",len,idx->dwChunkLength);
+ printf("ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
continue;
}
} else return 0;