[Mplayer-cvslog] CVS: main asfheader.c,1.7,1.8 aviheader.c,1.9,1.10 demux_asf.c,1.5,1.6 demux_avi.c,1.5,1.6
Szabolcs Berecz
szabii at users.sourceforge.net
Tue Apr 24 00:33:08 CEST 2001
Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv24213
Modified Files:
asfheader.c aviheader.c demux_asf.c demux_avi.c
Log Message:
some warnings have gone
Index: asfheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/asfheader.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** asfheader.c 2001/04/23 03:42:17 1.7
--- asfheader.c 2001/04/23 22:33:06 1.8
***************
*** 121,125 ****
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("unk1: %lX unk2: %X\n",streamh.unk1,streamh.unk2);
printf("FILEPOS=0x%X\n",stream_tell(demuxer->stream));
}
--- 121,125 ----
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("unk1: %lX unk2: %X\n",(unsigned long)streamh.unk1,(unsigned int)streamh.unk2);
printf("FILEPOS=0x%X\n",stream_tell(demuxer->stream));
}
Index: aviheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/aviheader.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** aviheader.c 2001/04/23 03:42:17 1.9
--- aviheader.c 2001/04/23 22:33:06 1.10
***************
*** 39,43 ****
int len=stream_read_dword_le(demuxer->stream)-4; // list size
id=stream_read_dword_le(demuxer->stream); // list type
! if(verbose>=2) printf("LIST %.4s len=%d\n",&id,len);
if(id==listtypeAVIMOVIE){
// found MOVI header
--- 39,43 ----
int len=stream_read_dword_le(demuxer->stream)-4; // list size
id=stream_read_dword_le(demuxer->stream); // list type
! if(verbose>=2) printf("LIST %.4s len=%d\n",(char *) &id,len);
if(id==listtypeAVIMOVIE){
// found MOVI header
***************
*** 51,55 ****
}
size2=stream_read_dword_le(demuxer->stream);
! if(verbose>=2) printf("CHUNK %.4s len=%d\n",&id,size2);
chunksize=(size2+1)&(~1);
switch(id){
--- 51,55 ----
}
size2=stream_read_dword_le(demuxer->stream);
! if(verbose>=2) printf("CHUNK %.4s len=%d\n",(char *) &id,size2);
chunksize=(size2+1)&(~1);
switch(id){
***************
*** 117,121 ****
case ckidAVINEWINDEX: if(index_mode){
demuxer->idx_size=size2>>4;
! if(verbose>=1) printf("Reading INDEX block, %d chunks for %d frames\n",
demuxer->idx_size,avih.dwTotalFrames);
demuxer->idx=malloc(demuxer->idx_size<<4);
--- 117,121 ----
case ckidAVINEWINDEX: if(index_mode){
demuxer->idx_size=size2>>4;
! if(verbose>=1) printf("Reading INDEX block, %d chunks for %ld frames\n",
demuxer->idx_size,avih.dwTotalFrames);
demuxer->idx=malloc(demuxer->idx_size<<4);
***************
*** 127,131 ****
}
if(chunksize>0) stream_skip(demuxer->stream,chunksize); else
! if(chunksize<0) printf("WARNING!!! chunksize=%d (id=%.4s)\n",chunksize,&id);
}
--- 127,131 ----
}
if(chunksize>0) stream_skip(demuxer->stream,chunksize); else
! if(chunksize<0) printf("WARNING!!! chunksize=%d (id=%.4s)\n",chunksize,(char *) &id);
}
***************
*** 171,175 ****
}
! if(verbose>=2) printf("%08X %08X %.4s %02X %X\n",demuxer->filepos,id,&id,c,idx->dwFlags);
#if 0
{ unsigned char tmp[64];
--- 171,175 ----
}
! if(verbose>=2) printf("%08X %08X %.4s %02X %X\n",demuxer->filepos,id,(char *) &id,c,(unsigned int) idx->dwFlags);
#if 0
{ unsigned char tmp[64];
Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/demux_asf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** demux_asf.c 2001/04/23 21:32:00 1.5
--- demux_asf.c 2001/04/23 22:33:06 1.6
***************
*** 191,195 ****
++p;
}
! if(verbose>=4) printf("%08X: flag=%02X segs=%d pad=%d time=%d dur=%d\n",
demux->filepos,flags,segs,padding,time,duration);
for(seg=0;seg<segs;seg++){
--- 191,195 ----
++p;
}
! if(verbose>=4) printf("%08X: flag=%02X segs=%d pad=%d time=%ld dur=%d\n",
demux->filepos,flags,segs,padding,time,duration);
for(seg=0;seg<segs;seg++){
Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/demux_avi.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** demux_avi.c 2001/04/23 03:42:17 1.5
--- demux_avi.c 2001/04/23 22:33:06 1.6
***************
*** 53,57 ****
if(id!=mmioFOURCC('J','U','N','K')){
// unknown
! if(verbose>=2) printf("Unknown chunk: %.4s (%X)\n",&id,id);
}
return NULL;
--- 53,57 ----
if(id!=mmioFOURCC('J','U','N','K')){
// unknown
! if(verbose>=2) printf("Unknown chunk: %.4s (%X)\n",(char *) &id,id);
}
return NULL;
***************
*** 140,144 ****
}
if(!demux_avi_select_stream(demux,idx->ckid)){
! if(verbose>2) printf("Skip chunk %.4s (0x%X) \n",&idx->ckid,idx->ckid);
continue; // skip this chunk
}
--- 140,144 ----
}
if(!demux_avi_select_stream(demux,idx->ckid)){
! if(verbose>2) printf("Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid);
continue; // skip this chunk
}
***************
*** 157,161 ****
id=stream_read_dword_le(demux->stream);
if(id!=idx->ckid){
! printf("ChunkID mismatch! raw=%.4s idx=%.4s \n",&id,&idx->ckid);
continue;
}
--- 157,161 ----
id=stream_read_dword_le(demux->stream);
if(id!=idx->ckid){
! printf("ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid);
continue;
}
***************
*** 164,168 ****
// if((len)!=(idx->dwChunkLength)){
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
! printf("ChunkSize mismatch! raw=%d idx=%d \n",len,idx->dwChunkLength);
continue;
}
--- 164,168 ----
// if((len)!=(idx->dwChunkLength)){
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
! printf("ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
continue;
}
***************
*** 215,219 ****
}
if(ds && demux_avi_select_stream(demux,idx->ckid)!=ds){
! if(verbose>2) printf("Skip chunk %.4s (0x%X) \n",&idx->ckid,idx->ckid);
continue; // skip this chunk
}
--- 215,219 ----
}
if(ds && demux_avi_select_stream(demux,idx->ckid)!=ds){
! if(verbose>2) printf("Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid);
continue; // skip this chunk
}
***************
*** 236,240 ****
if(id!=idx->ckid){
! printf("ChunkID mismatch! raw=%.4s idx=%.4s \n",&id,&idx->ckid);
continue;
}
--- 236,240 ----
if(id!=idx->ckid){
! printf("ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid);
continue;
}
***************
*** 243,247 ****
// if((len)!=(idx->dwChunkLength)){
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
! printf("ChunkSize mismatch! raw=%d idx=%d \n",len,idx->dwChunkLength);
continue;
}
--- 243,247 ----
// if((len)!=(idx->dwChunkLength)){
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
! printf("ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
continue;
}
_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
More information about the MPlayer-cvslog
mailing list