RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-06 17:43:02 +00:00
Code Issues Releases Wiki Activity

some warnings have gone

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@601 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
szabii 2001-04-23 22:33:06 +00:00
parent 6d8b5b0f6d
commit 63959d55d0
4 changed files with 14 additions and 14 deletions

2
asfheader.c
View File

@ -120,7 +120,7 @@ if(verbose){
printf("stream type: %s\n",asf_chunk_type(streamh.type)); printf("stream type: %s\n",asf_chunk_type(streamh.type));
printf("stream concealment: %s\n",asf_chunk_type(streamh.concealment)); printf("stream concealment: %s\n",asf_chunk_type(streamh.concealment));
printf("type: %d bytes, stream: %d bytes ID: %d\n",(int)streamh.type_size,(int)streamh.stream_size,(int)streamh.stream_no); printf("type: %d bytes, stream: %d bytes ID: %d\n",(int)streamh.type_size,(int)streamh.stream_size,(int)streamh.stream_no);
printf("unk1: %lX unk2: %X\n",streamh.unk1,streamh.unk2); printf("unk1: %lX unk2: %X\n",(unsigned long)streamh.unk1,(unsigned int)streamh.unk2);
printf("FILEPOS=0x%X\n",stream_tell(demuxer->stream)); printf("FILEPOS=0x%X\n",stream_tell(demuxer->stream));
} }
// type-specific data: // type-specific data:

10
aviheader.c
View File

@ -38,7 +38,7 @@ while(1){
if(id==mmioFOURCC('L','I','S','T')){ if(id==mmioFOURCC('L','I','S','T')){
int len=stream_read_dword_le(demuxer->stream)-4; // list size int len=stream_read_dword_le(demuxer->stream)-4; // list size
id=stream_read_dword_le(demuxer->stream); // list type id=stream_read_dword_le(demuxer->stream); // list type
if(verbose>=2) printf("LIST %.4s len=%d\n",&id,len); if(verbose>=2) printf("LIST %.4s len=%d\n",(char *) &id,len);
if(id==listtypeAVIMOVIE){ if(id==listtypeAVIMOVIE){
// found MOVI header // found MOVI header
demuxer->movi_start=stream_tell(demuxer->stream); demuxer->movi_start=stream_tell(demuxer->stream);
@ -50,7 +50,7 @@ while(1){
continue; continue;
} }
size2=stream_read_dword_le(demuxer->stream); size2=stream_read_dword_le(demuxer->stream);
if(verbose>=2) printf("CHUNK %.4s len=%d\n",&id,size2); if(verbose>=2) printf("CHUNK %.4s len=%d\n",(char *) &id,size2);
chunksize=(size2+1)&(~1); chunksize=(size2+1)&(~1);
switch(id){ switch(id){
case ckidAVIMAINHDR: // read 'avih' case ckidAVIMAINHDR: // read 'avih'
@ -116,7 +116,7 @@ while(1){
} }
case ckidAVINEWINDEX: if(index_mode){ case ckidAVINEWINDEX: if(index_mode){
demuxer->idx_size=size2>>4; demuxer->idx_size=size2>>4;
if(verbose>=1) printf("Reading INDEX block, %d chunks for %d frames\n", if(verbose>=1) printf("Reading INDEX block, %d chunks for %ld frames\n",
demuxer->idx_size,avih.dwTotalFrames); demuxer->idx_size,avih.dwTotalFrames);
demuxer->idx=malloc(demuxer->idx_size<<4); demuxer->idx=malloc(demuxer->idx_size<<4);
stream_read(demuxer->stream,(char*)demuxer->idx,demuxer->idx_size<<4); stream_read(demuxer->stream,(char*)demuxer->idx,demuxer->idx_size<<4);
@ -126,7 +126,7 @@ while(1){
} }
} }
if(chunksize>0) stream_skip(demuxer->stream,chunksize); else if(chunksize>0) stream_skip(demuxer->stream,chunksize); else
if(chunksize<0) printf("WARNING!!! chunksize=%d (id=%.4s)\n",chunksize,&id); if(chunksize<0) printf("WARNING!!! chunksize=%d (id=%.4s)\n",chunksize,(char *) &id);
} }
@ -170,7 +170,7 @@ if(index_mode>=2 || (demuxer->idx_size==0 && index_mode==1)){
if(c&0x40) idx->dwFlags=0; if(c&0x40) idx->dwFlags=0;
} }
if(verbose>=2) printf("%08X %08X %.4s %02X %X\n",demuxer->filepos,id,&id,c,idx->dwFlags); if(verbose>=2) printf("%08X %08X %.4s %02X %X\n",demuxer->filepos,id,(char *) &id,c,(unsigned int) idx->dwFlags);
#if 0 #if 0
{ unsigned char tmp[64]; { unsigned char tmp[64];
int i; int i;

2
demux_asf.c
View File

@ -190,7 +190,7 @@ int demux_asf_fill_buffer(demuxer_t *demux){
segs=p[0] & 0x3F; segs=p[0] & 0x3F;
++p; ++p;
} }
if(verbose>=4) printf("%08X: flag=%02X segs=%d pad=%d time=%d dur=%d\n", if(verbose>=4) printf("%08X: flag=%02X segs=%d pad=%d time=%ld dur=%d\n",
demux->filepos,flags,segs,padding,time,duration); demux->filepos,flags,segs,padding,time,duration);
for(seg=0;seg<segs;seg++){ for(seg=0;seg<segs;seg++){
//ASF_segmhdr_t* sh; //ASF_segmhdr_t* sh;

14
demux_avi.c
View File

@ -52,7 +52,7 @@ demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){
} }
if(id!=mmioFOURCC('J','U','N','K')){ if(id!=mmioFOURCC('J','U','N','K')){
// unknown // 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; return NULL;
} }
@ -139,7 +139,7 @@ do{
continue; continue;
} }
if(!demux_avi_select_stream(demux,idx->ckid)){ 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 continue; // skip this chunk
} }
@ -156,14 +156,14 @@ do{
stream_seek(demux->stream,pos); stream_seek(demux->stream,pos);
id=stream_read_dword_le(demux->stream); id=stream_read_dword_le(demux->stream);
if(id!=idx->ckid){ 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; continue;
} }
len=stream_read_dword_le(demux->stream); len=stream_read_dword_le(demux->stream);
// if((len&(~1))!=(idx->dwChunkLength&(~1))){ // if((len&(~1))!=(idx->dwChunkLength&(~1))){
// if((len)!=(idx->dwChunkLength)){ // if((len)!=(idx->dwChunkLength)){
if((len!=idx->dwChunkLength)&&((len+1)!=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; continue;
} }
} else { } else {
@ -214,7 +214,7 @@ do{
continue; continue;
} }
if(ds && demux_avi_select_stream(demux,idx->ckid)!=ds){ 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 continue; // skip this chunk
} }
@ -235,14 +235,14 @@ do{
if(stream_eof(demux->stream)) return 0; if(stream_eof(demux->stream)) return 0;
if(id!=idx->ckid){ 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; continue;
} }
len=stream_read_dword_le(demux->stream); len=stream_read_dword_le(demux->stream);
// if((len&(~1))!=(idx->dwChunkLength&(~1))){ // if((len&(~1))!=(idx->dwChunkLength&(~1))){
// if((len)!=(idx->dwChunkLength)){ // if((len)!=(idx->dwChunkLength)){
if((len!=idx->dwChunkLength)&&((len+1)!=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; continue;
} }
} else return 0; } else return 0;