[MPlayer-cvslog] CVS: main/libmpdemux aviheader.c, 1.68, 1.69 cache2.c, 1.31, 1.32 demux_asf.c, 1.39, 1.40 demux_avi.c, 1.69, 1.70 demux_film.c, 1.13, 1.14 demux_lmlm4.c, 1.3, 1.4 demux_mov.c, 1.135, 1.136 demux_mpg.c, 1.68, 1.69 demux_pva.c, 1.6, 1.7 demux_rawdv.c, 1.11, 1.12 demux_real.c, 1.81, 1.82 demux_ty.c, 1.12, 1.13 demux_viv.c, 1.31, 1.32 demuxer.c, 1.212, 1.213 muxer_avi.c, 1.33, 1.34 muxer_mpeg.c, 1.29, 1.30 tvi_v4l.c, 1.75, 1.76
Dominik Mierzejewski CVS
syncmail at mplayerhq.hu
Thu Jan 12 21:04:39 CET 2006
- Previous message: [MPlayer-cvslog] CVS: main/vidix/drivers savage_vid.c,1.3,1.4
- Next message: [MPlayer-cvslog] CVS: main/libvo vo_dga.c, 1.74, 1.75 vo_dxr3.c, 1.126, 1.127 vo_gif89a.c, 1.16, 1.17 x11_common.c, 1.202, 1.203
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
CVS change done by Dominik Mierzejewski CVS
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv26918/libmpdemux
Modified Files:
aviheader.c cache2.c demux_asf.c demux_avi.c demux_film.c
demux_lmlm4.c demux_mov.c demux_mpg.c demux_pva.c
demux_rawdv.c demux_real.c demux_ty.c demux_viv.c demuxer.c
muxer_avi.c muxer_mpeg.c tvi_v4l.c
Log Message:
massive attack: mp_msg printf format fixes
Index: aviheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviheader.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- aviheader.c 31 Oct 2005 23:37:41 -0000 1.68
+++ aviheader.c 12 Jan 2006 20:04:34 -0000 1.69
@@ -238,7 +238,7 @@
s->aIndex[i].qwOffset |= ((uint64_t)stream_read_dword_le(demuxer->stream) & 0xffffffff)<<32;
s->aIndex[i].dwSize = stream_read_dword_le(demuxer->stream);
s->aIndex[i].dwDuration = stream_read_dword_le(demuxer->stream);
- mp_msg (MSGT_HEADER, MSGL_V, "ODML (%.4s): [%d] 0x%016llx 0x%04lx %ld\n",
+ mp_msg (MSGT_HEADER, MSGL_V, "ODML (%.4s): [%d] 0x%016"PRIx64" 0x%04x %u\n",
(s->dwChunkId), i,
(uint64_t)s->aIndex[i].qwOffset, s->aIndex[i].dwSize, s->aIndex[i].dwDuration);
}
@@ -353,7 +353,7 @@
uint32_t last_off = 0;
priv->idx_size=size2>>4;
mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_ReadingIndexBlockChunksForFrames,
- priv->idx_size,avih.dwTotalFrames, stream_tell(demuxer->stream));
+ priv->idx_size,avih.dwTotalFrames, (int64_t)stream_tell(demuxer->stream));
priv->idx=malloc(priv->idx_size<<4);
// printf("\nindex to %p !!!!! (priv=%p)\n",priv->idx,priv);
stream_read(demuxer->stream,(char*)priv->idx,priv->idx_size<<4);
@@ -410,9 +410,9 @@
demux_info_add(demuxer, hdr, buf);
}
}
- mp_msg(MSGT_HEADER,MSGL_DBG2,"list_end=0x%X pos=0x%X chunksize=0x%X next=0x%X\n",
- (int)list_end, (int)stream_tell(demuxer->stream),
- chunksize, (int)chunksize+stream_tell(demuxer->stream));
+ mp_msg(MSGT_HEADER,MSGL_DBG2,"list_end=0x%"PRIX64" pos=0x%"PRIX64" chunksize=0x%"PRIX64" next=0x%"PRIX64"\n",
+ (int64_t)list_end, (int64_t)stream_tell(demuxer->stream),
+ (int64_t)chunksize, (int64_t)chunksize+(int64_t)stream_tell(demuxer->stream));
if(list_end>0 &&
chunksize+stream_tell(demuxer->stream) == list_end) list_end=0;
if(list_end>0 && chunksize+stream_tell(demuxer->stream)>list_end){
Index: cache2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cache2.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cache2.c 18 Nov 2005 14:39:18 -0000 1.31
+++ cache2.c 12 Jan 2006 20:04:34 -0000 1.32
@@ -120,7 +120,7 @@
if(read<s->min_filepos || read>s->max_filepos){
// seek...
- mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%X \n",read);
+ mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%"PRIX64" \n",(int64_t)read);
// streaming: drop cache contents only if seeking backward or too much fwd:
if(s->stream->type!=STREAMTYPE_STREAM ||
read<s->min_filepos || read>=s->max_filepos+s->seek_limit)
@@ -129,7 +129,7 @@
s->min_filepos=s->max_filepos=read; // drop cache content :(
if(s->stream->eof) stream_reset(s->stream);
stream_seek(s->stream,read);
- mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%X \n",(int)stream_tell(s->stream));
+ mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%"PRIX64" \n",(int64_t)stream_tell(s->stream));
}
}
@@ -288,12 +288,12 @@
stream->cache_pid = CreateThread(NULL,0,ThreadProc,s,0,&threadId);
#endif
// wait until cache is filled at least prefill_init %
- mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d pre:%d eof:%d \n",
- s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof);
+ mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n",
+ (int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,(int64_t)s->eof);
while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){
mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill,
100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size),
- s->max_filepos-s->read_filepos
+ (int64_t)s->max_filepos-s->read_filepos
);
if(s->eof) break; // file is smaller than prefill size
if(mp_input_check_interrupt(PREFILL_SLEEP_TIME))
@@ -347,7 +347,7 @@
s=stream->cache_data;
// s->seek_lock=1;
- mp_msg(MSGT_CACHE,MSGL_DBG2,"CACHE2_SEEK: 0x%X <= 0x%X (0x%X) <= 0x%X \n",s->min_filepos,(int)pos,s->read_filepos,s->max_filepos);
+ mp_msg(MSGT_CACHE,MSGL_DBG2,"CACHE2_SEEK: 0x%"PRIX64" <= 0x%"PRIX64" (0x%"PRIX64") <= 0x%"PRIX64" \n",s->min_filepos,pos,s->read_filepos,s->max_filepos);
newpos=pos/s->sector_size; newpos*=s->sector_size; // align
stream->pos=s->read_filepos=newpos;
Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_asf.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- demux_asf.c 8 Jan 2006 14:03:41 -0000 1.39
+++ demux_asf.c 12 Jan 2006 20:04:34 -0000 1.40
@@ -361,7 +361,7 @@
return 1; // success
}
- mp_msg(MSGT_DEMUX,MSGL_V,"%08X: UNKNOWN TYPE %02X %02X %02X %02X %02X...\n",demux->filepos,asf_packet[0],asf_packet[1],asf_packet[2],asf_packet[3],asf_packet[4]);
+ mp_msg(MSGT_DEMUX,MSGL_V,"%08"PRIX64": UNKNOWN TYPE %02X %02X %02X %02X %02X...\n",(int64_t)demux->filepos,asf_packet[0],asf_packet[1],asf_packet[2],asf_packet[3],asf_packet[4]);
return 0;
}
Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- demux_avi.c 8 Jan 2006 13:35:54 -0000 1.69
+++ demux_avi.c 12 Jan 2006 20:04:34 -0000 1.70
@@ -221,7 +221,7 @@
pos = (off_t)priv->idx_offset+AVI_IDX_OFFSET(idx);
if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & STREAM_SEEK)){
- mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%X \n",pos);
+ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%"PRIX64" \n",(int64_t)pos);
continue;
}
#if 0
@@ -245,7 +245,7 @@
// if((len&(~1))!=(idx->dwChunkLength&(~1))){
// if((len)!=(idx->dwChunkLength)){
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
- mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
+ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%d \n",len,idx->dwChunkLength);
if(len>0x200000 && idx->dwChunkLength>0x200000) continue; // both values bad :(
len=choose_chunk_len(idx->dwChunkLength,len);
}
@@ -335,7 +335,7 @@
pos = priv->idx_offset+AVI_IDX_OFFSET(idx);
if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start)){
- mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! current=0x%X idx=0x%X \n",demux->filepos,pos);
+ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! current=0x%"PRIX64" idx=0x%"PRIX64" \n",(int64_t)demux->filepos,(int64_t)pos);
continue;
}
#if 0
@@ -358,7 +358,7 @@
}
len=stream_read_dword_le(demux->stream);
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
- mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
+ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%d \n",len,idx->dwChunkLength);
if(len>0x200000 && idx->dwChunkLength>0x200000) continue; // both values bad :(
len=choose_chunk_len(idx->dwChunkLength,len);
}
@@ -582,7 +582,7 @@
asamples+=(len+priv->audio_block_size-1)/priv->audio_block_size;
}
}
- mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%lu (%lu) audio size=%lu (%lu)\n",vsize,vsamples,asize,asamples);
+ mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%u (%u) audio size=%u (%u)\n",vsize,vsamples,asize,asamples);
priv->numberofframes=vsamples;
sh_video->i_bps=((float)vsize/(float)vsamples)*(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
if(sh_audio) sh_audio->i_bps=((float)asize/(float)asamples)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
@@ -609,7 +609,7 @@
}
}
vsize=demuxer->movi_end-demuxer->movi_start-asize-8*priv->numberofframes;
- mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%lu (%lu) audio size=%lu\n",vsize,priv->numberofframes,asize);
+ mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%d (%u) audio size=%d\n",vsize,priv->numberofframes,asize);
sh_video->i_bps=(float)vsize/(sh_video->frametime*priv->numberofframes);
}
return demuxer;
Index: demux_film.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_film.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- demux_film.c 5 Aug 2005 19:57:46 -0000 1.13
+++ demux_film.c 12 Jan 2006 20:04:34 -0000 1.14
@@ -249,7 +249,7 @@
header_size -= 16;
mp_msg(MSGT_DEMUX, MSGL_HINT, "FILM version %.4s\n",
- &film_data->film_version);
+ (char *)&film_data->film_version);
// skip to where the next chunk should be
stream_skip(demuxer->stream, 4);
Index: demux_lmlm4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_lmlm4.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demux_lmlm4.c 5 Aug 2005 19:57:46 -0000 1.3
+++ demux_lmlm4.c 12 Jan 2006 20:04:34 -0000 1.4
@@ -216,7 +216,7 @@
hdr:
demux->filepos = stream_tell(demux->stream);
- mp_msg(MSGT_DEMUX, MSGL_DBG2, "fpos = %d\n", demux->filepos);
+ mp_msg(MSGT_DEMUX, MSGL_DBG2, "fpos = %"PRId64"\n", (int64_t)demux->filepos);
ret=getFrame(demux, &frameInfo);
if(ret<=0) return ret; // EOF/error
Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- demux_mov.c 2 Jan 2006 06:56:22 -0000 1.135
+++ demux_mov.c 12 Jan 2006 20:04:34 -0000 1.136
@@ -388,7 +388,7 @@
break;
default:
tmp = be2me_32(tmp);
- mp_msg(MSGT_DEMUX,MSGL_WARN,"ISO: Unknown File Type Major Brand: %.4s\n",&tmp);
+ mp_msg(MSGT_DEMUX,MSGL_WARN,"ISO: Unknown File Type Major Brand: %.4s\n",(char *)&tmp);
}
mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Minor Version: %d\n",
stream_read_dword(demuxer->stream));
@@ -396,7 +396,7 @@
// List all compatible brands
for(i = 0; i < ((len-16)/4); i++) {
tmp = be2me_32(stream_read_dword(demuxer->stream));
- mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Compatible Brand #%d: %.4s\n",i,&tmp);
+ mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Compatible Brand #%d: %.4s\n",i,(char *)&tmp);
skipped += 4;
}
#endif
@@ -406,8 +406,8 @@
mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Movie header found!\n");
priv->moov_start=(off_t)stream_tell(demuxer->stream);
priv->moov_end=(off_t)priv->moov_start+len-skipped;
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie header: start: %x end: %x\n",
- priv->moov_start, priv->moov_end);
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie header: start: %"PRIx64" end: %"PRIx64"\n",
+ (int64_t)priv->moov_start, (int64_t)priv->moov_end);
skipped+=8;
i = stream_read_dword(demuxer->stream)-8;
if(stream_read_dword(demuxer->stream)==MOV_FOURCC('r','m','r','a')){
@@ -470,8 +470,8 @@
mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Movie DATA found!\n");
priv->mdat_start=stream_tell(demuxer->stream);
priv->mdat_end=priv->mdat_start+len-skipped;
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie data: start: %x end: %x\n",
- priv->mdat_start, priv->mdat_end);
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie data: start: %"PRIx64" end: %"PRIx64"\n",
+ (int64_t)priv->mdat_start, (int64_t)priv->mdat_end);
flags|=2;
if(flags==3){
// if we're over the headers, then we can stop parsing here!
@@ -482,7 +482,7 @@
case MOV_FOURCC('f','r','e','e'):
case MOV_FOURCC('s','k','i','p'):
case MOV_FOURCC('j','u','n','k'):
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: free space (len: %d)\n", len);
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: free space (len: %"PRId64")\n", (int64_t)len);
/* unused, if you edit a mov, you can use space provided by free atoms (redefining it) */
break;
case MOV_FOURCC('p','n','o','t'):
@@ -492,7 +492,7 @@
default:
if(no==0){ free(priv); return 0;} // first chunk is bad!
id = be2me_32(id);
- mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",&id,(int)len);
+ mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",(char *)&id,(int)len);
}
skip_chunk:
if(!stream_skip(demuxer->stream,len-skipped)) break;
@@ -560,7 +560,7 @@
len-=8;
id=stream_read_dword(demuxer->stream);
//
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"lschunks %.4s %d\n",&id,(int)len);
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"lschunks %.4s %d\n",(char *)&id,(int)len);
//
if(trak){
if (lschunks_intrak(demuxer, level, id, pos, len, trak) < 0)
@@ -806,7 +806,7 @@
atom_len);
}
}
- mp_msg(MSGT_DEMUX, MSGL_INFO, "Fourcc: %.4s\n",&trak->fourcc);
+ mp_msg(MSGT_DEMUX, MSGL_INFO, "Fourcc: %.4s\n",(char *)&trak->fourcc);
#if 0
{ FILE* f=fopen("stdata.dat","wb");
fwrite(trak->stdata,trak->stdata_len,1,f);
@@ -1150,7 +1150,7 @@
mp_msg(MSGT_DEMUX, MSGL_INFO, "Display size: %d x %d\n",
trak->tkdata[77]|(trak->tkdata[76]<<8),
trak->tkdata[81]|(trak->tkdata[80]<<8));
- mp_msg(MSGT_DEMUX, MSGL_INFO, "Fourcc: %.4s Codec: '%.*s'\n",&trak->fourcc,trak->stdata[42]&31,trak->stdata+43);
+ mp_msg(MSGT_DEMUX, MSGL_INFO, "Fourcc: %.4s Codec: '%.*s'\n",(char *)&trak->fourcc,trak->stdata[42]&31,trak->stdata+43);
// if(demuxer->video->id==-1 || demuxer->video->id==priv->track_db){
// // (auto)selected video track:
@@ -1231,7 +1231,7 @@
case MOV_FOURCC('d','c','o','m'): {
// int temp=stream_read_dword(demuxer->stream);
unsigned int algo=be2me_32(stream_read_dword(demuxer->stream));
- mp_msg(MSGT_DEMUX, MSGL_INFO, "Compressed header uses %.4s algo!\n",&algo);
+ mp_msg(MSGT_DEMUX, MSGL_INFO, "Compressed header uses %.4s algo!\n",(char *)&algo);
break;
}
case MOV_FOURCC('c','m','v','d'): {
@@ -1275,7 +1275,7 @@
}
#endif
if(moov_sz != zstrm.total_out)
- mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! moov size differs cmov: %d zlib: %d\n",moov_sz,zstrm.total_out);
+ mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! moov size differs cmov: %d zlib: %ld\n",moov_sz,zstrm.total_out);
zret = inflateEnd(&zstrm);
backup=demuxer->stream;
@@ -1303,7 +1303,7 @@
udta_len = stream_read_dword(demuxer->stream);
udta_id = stream_read_dword(demuxer->stream);
udta_size -= 8;
- mp_msg(MSGT_DEMUX, MSGL_DBG2, "udta_id: %.4s (len: %d)\n", &udta_id, udta_len);
+ mp_msg(MSGT_DEMUX, MSGL_DBG2, "udta_id: %.4s (len: %"PRId64")\n", (char *)&udta_id, (int64_t)udta_len);
switch (udta_id)
{
case MOV_FOURCC(0xa9,'c','p','y'):
@@ -1406,7 +1406,7 @@
} /* eof udta */
default:
id = be2me_32(id);
- mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",&id,(int)len);
+ mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",(char *)&id,(int)len);
} /* endof switch */
} /* endof else */
@@ -1482,7 +1482,7 @@
str[len] = 0;
mp_msg(MSGT_DEMUX, MSGL_V,
"MOV: %*sHandler header: %.4s/%.4s (%.4s) %s\n", level, "",
- &type, &subtype, &manufact, str);
+ (char *)&type, (char *)&subtype, (char *)&manufact, str);
free(str);
switch(bswap_32(type)) {
case MOV_FOURCC('m','h','l','r'):
@@ -1494,7 +1494,7 @@
default:
mp_msg(MSGT_DEMUX, MSGL_V,
"MOV: unknown handler class: 0x%X (%.4s)\n",
- bswap_32(type), &type);
+ bswap_32(type), (char *)&type);
}
break;
}
@@ -1536,8 +1536,8 @@
if (len < 8)
break; // error
mp_msg(MSGT_DEMUX, MSGL_V,
- "MOV: %*s desc #%d: %.4s (%d bytes)\n", level, "",
- i, &fourcc, len - 16);
+ "MOV: %*s desc #%d: %.4s (%"PRId64" bytes)\n", level, "",
+ i, (char *)&fourcc, (int64_t)len - 16);
if (fourcc != trak->fourcc && i)
mp_msg(MSGT_DEMUX, MSGL_WARN, MSGTR_MOVvariableFourCC);
// if(!i)
@@ -1582,7 +1582,7 @@
int flags = (temp << 16) | (temp << 8) | temp;
int i;
mp_msg(MSGT_DEMUX, MSGL_V,
- "MOV: %*sSample->Chunk mapping table! (%d blocks) (ver:%d,flags:%ld)\n", level, "",
+ "MOV: %*sSample->Chunk mapping table! (%d blocks) (ver:%d,flags:%d)\n", level, "",
len, ver, flags);
// read data:
trak->chunkmap_size = len;
@@ -1602,7 +1602,7 @@
int entries = stream_read_dword(demuxer->stream);
int i;
mp_msg(MSGT_DEMUX, MSGL_V,
- "MOV: %*sSample size table! (entries=%d ss=%d) (ver:%d,flags:%ld)\n", level, "",
+ "MOV: %*sSample size table! (entries=%d ss=%d) (ver:%d,flags:%d)\n", level, "",
entries, ss, ver, flags);
trak->samplesize = ss;
if (!ss) {
@@ -1662,7 +1662,7 @@
int flags = (temp << 16) | (temp<<8) | temp;
int i;
mp_msg(MSGT_DEMUX, MSGL_V,
- "MOV: %*sSyncing samples (keyframes) table! (%d entries) (ver:%d,flags:%ld)\n", level, "",
+ "MOV: %*sSyncing samples (keyframes) table! (%d entries) (ver:%d,flags:%d)\n", level, "",
entries, ver, flags);
trak->keyframes_size = entries;
trak->keyframes = malloc(sizeof(unsigned int) * entries);
@@ -1697,7 +1697,7 @@
int flags = (temp << 16) | (temp << 8) | temp;
int i;
mp_msg(MSGT_DEMUX, MSGL_V,
- "MOV: %*sEdit list table (%d entries) (ver:%d,flags:%ld)\n", level, "",
+ "MOV: %*sEdit list table (%d entries) (ver:%d,flags:%d)\n", level, "",
entries, ver, flags);
#if 1
trak->editlist_size = entries;
@@ -1722,7 +1722,7 @@
}
default:
id = be2me_32(id);
- mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",&id,(int)len);
+ mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",(char *)&id,(int)len);
break;
}//switch(id)
return 0;
@@ -1740,8 +1740,8 @@
stream_reset(demuxer->stream);
if(!stream_seek(demuxer->stream,priv->moov_start))
{
- mp_msg(MSGT_DEMUX,MSGL_ERR,"MOV: Cannot seek to the beginning of the Movie header (0x%x)\n",
- priv->moov_start);
+ mp_msg(MSGT_DEMUX,MSGL_ERR,"MOV: Cannot seek to the beginning of the Movie header (0x%"PRIx64")\n",
+ (int64_t)priv->moov_start);
return 0;
}
lschunks(demuxer, 0, priv->moov_end, NULL);
@@ -1832,7 +1832,7 @@
zret = inflateInit(&zstrm);
zret = inflate(&zstrm, Z_NO_FLUSH);
if(newlen != zstrm.total_out)
- mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! unzipped frame size differs hdr: %d zlib: %d\n",newlen,zstrm.total_out);
+ mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! unzipped frame size differs hdr: %d zlib: %ld\n",newlen,zstrm.total_out);
write(fd, buf2, newlen);
} else {
Index: demux_mpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- demux_mpg.c 3 Jan 2006 07:29:59 -0000 1.68
+++ demux_mpg.c 12 Jan 2006 20:04:34 -0000 1.69
@@ -616,7 +616,7 @@
if(demux->synced==1){
if(head==0x1BB || head==0x1BD || (head>=0x1C0 && head<=0x1EF)){
demux->synced=2;
- mp_msg(MSGT_DEMUX,MSGL_V,"system stream synced at 0x%X (%d)!\n",demux->filepos,demux->filepos);
+ mp_msg(MSGT_DEMUX,MSGL_V,"system stream synced at 0x%"PRIX64" (%"PRId64")!\n",(int64_t)demux->filepos,(int64_t)demux->filepos);
num_elementary_packets100=0; // requires for re-sync!
num_elementary_packets101=0; // requires for re-sync!
} else demux->synced=0;
Index: demux_pva.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_pva.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demux_pva.c 11 Dec 2005 17:21:02 -0000 1.6
+++ demux_pva.c 12 Jan 2006 20:04:34 -0000 1.7
@@ -326,7 +326,7 @@
{
if(stream_read_word(d->stream) != (('A'<<8)|'V'))
{
- mp_msg(MSGT_DEMUX,MSGL_V,"demux_pva: pva_get_payload() missed a SyncWord at %ld!! Trying to sync...\n",stream_tell(d->stream));
+ mp_msg(MSGT_DEMUX,MSGL_V,"demux_pva: pva_get_payload() missed a SyncWord at %"PRId64"!! Trying to sync...\n",(int64_t)stream_tell(d->stream));
if(!pva_sync(d))
{
if (!d->stream->eof)
@@ -350,7 +350,7 @@
flags=stream_read_char(d->stream);
payload->is_packet_start=flags & 0x10;
pack_size=le2me_16(stream_read_word(d->stream));
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_pva::pva_get_payload(): pack_size=%u field read at offset %lu\n",pack_size,stream_tell(d->stream)-2);
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_pva::pva_get_payload(): pack_size=%u field read at offset %"PRIu64"\n",pack_size,(int64_t)stream_tell(d->stream)-2);
pva_payload_start=stream_tell(d->stream);
next_offset=pva_payload_start+pack_size;
Index: demux_rawdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawdv.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- demux_rawdv.c 2 Sep 2005 08:32:32 -0000 1.11
+++ demux_rawdv.c 12 Jan 2006 20:04:34 -0000 1.12
@@ -135,7 +135,7 @@
rawdv_frames_t *frames = (rawdv_frames_t *)malloc(sizeof(rawdv_frames_t));
dv_decoder_t *dv_decoder=NULL;
- mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() end_pos %d\n",demuxer->stream->end_pos);
+ mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() end_pos %"PRId64"\n",(int64_t)demuxer->stream->end_pos);
// go back to the beginning
stream_reset(demuxer->stream);
Index: demux_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- demux_real.c 8 Jan 2006 14:03:41 -0000 1.81
+++ demux_real.c 12 Jan 2006 20:04:34 -0000 1.82
@@ -1790,7 +1790,7 @@
if(demuxer->video->sh){
sh_video_t *sh=demuxer->video->sh;
mp_msg(MSGT_DEMUX,MSGL_V,"VIDEO: %.4s [%08X,%08X] %dx%d (aspect %4.2f) %4.2f fps\n",
- &sh->format,((unsigned int*)(sh->bih+1))[1],((unsigned int*)(sh->bih+1))[0],
+ (char *)&sh->format,((unsigned int*)(sh->bih+1))[1],((unsigned int*)(sh->bih+1))[0],
sh->disp_w,sh->disp_h,sh->aspect,sh->fps);
}
Index: demux_ty.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ty.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- demux_ty.c 11 Dec 2005 17:21:02 -0000 1.12
+++ demux_ty.c 12 Jan 2006 20:04:34 -0000 1.13
@@ -188,7 +188,7 @@
}
if ( ok == 0 )
{
- mp_msg( MSGT_DEMUX, MSGL_DBG3, "Seek bad %d\n", offset );
+ mp_msg( MSGT_DEMUX, MSGL_DBG3, "Seek bad %"PRId64"\n", (int64_t)offset );
done = 1;
error = 1;
break;
@@ -282,9 +282,9 @@
tivo->tmf_totalchunks += ( tivo->tmfparts[ index ].fileSize / CHUNKSIZE );
}
mp_msg( MSGT_DEMUX, MSGL_DBG3,
- "tmf_filetoparts():total size %"PRId64"\n", tivo->tmf_totalsize );
+ "tmf_filetoparts():total size %"PRId64"\n", (int64_t)tivo->tmf_totalsize );
mp_msg( MSGT_DEMUX, MSGL_DBG3,
- "tmf_filetoparts():total chunks %d\n", tivo->tmf_totalchunks );
+ "tmf_filetoparts():total chunks %"PRId64"\n", (int64_t)tivo->tmf_totalchunks );
return( 1 );
}
@@ -697,8 +697,8 @@
numberParts = demux->stream->end_pos / TIVO_PART_LENGTH;
offset = numberParts * TIVO_PART_LENGTH;
- mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:ty/ty+Number Parts %d\n",
- numberParts );
+ mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:ty/ty+Number Parts %"PRId64"\n",
+ (int64_t)numberParts );
if ( ( offset + CHUNKSIZE ) < demux->stream->end_pos )
{
@@ -753,13 +753,13 @@
// Give a clue as to where we are in the stream
// ======================================================================
mp_msg( MSGT_DEMUX, MSGL_DBG3,
- "ty:ty header size %"PRIx64"\n", tivo->size );
+ "ty:ty header size %"PRIx64"\n", (int64_t)tivo->size );
mp_msg( MSGT_DEMUX, MSGL_DBG3,
- "ty:ty which Chunk %"PRIx64"\n", tivo->whichChunk );
+ "ty:ty which Chunk %d\n", tivo->whichChunk );
mp_msg( MSGT_DEMUX, MSGL_DBG3,
- "ty:file end_pos %"PRIx64"\n", demux->stream->end_pos );
+ "ty:file end_pos %"PRIx64"\n", (int64_t)demux->stream->end_pos );
mp_msg( MSGT_DEMUX, MSGL_DBG3,
- "\nty:wanted current offset %"PRIx64"\n", stream_tell( demux->stream ) );
+ "\nty:wanted current offset %"PRIx64"\n", (int64_t)stream_tell( demux->stream ) );
if ( tivo->size > 0 )
{
Index: demux_viv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_viv.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- demux_viv.c 10 Jan 2006 11:09:03 -0000 1.31
+++ demux_viv.c 12 Jan 2006 20:04:34 -0000 1.32
@@ -113,8 +113,8 @@
header_len -= strlen(token)+2;
if (sscanf(token, "%[^:]:%[^\n]", opt, param) != 2)
{
- mp_msg(MSGT_DEMUX, MSGL_V, "viv_text_header_parser: bad line: '%s' at ~%p\n",
- token, stream_tell(demux->stream));
+ mp_msg(MSGT_DEMUX, MSGL_V, "viv_text_header_parser: bad line: '%s' at ~%#"PRIx64"\n",
+ token, (int64_t)stream_tell(demux->stream));
break;
}
mp_dbg(MSGT_DEMUX, MSGL_DBG3, "token: '%s' (%d bytes/%d bytes left)\n",
@@ -364,8 +364,8 @@
audio_pos+=len;
break;
default:
- mp_msg(MSGT_DEMUX,MSGL_WARN,"VIVO - unknown ID found: %02X at pos %lu contact author!\n",
- c, stream_tell(demux->stream));
+ mp_msg(MSGT_DEMUX,MSGL_WARN,"VIVO - unknown ID found: %02X at pos %"PRIu64" contact author!\n",
+ c, (int64_t)stream_tell(demux->stream));
return 0;
}
Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- demuxer.c 9 Jan 2006 19:35:44 -0000 1.212
+++ demuxer.c 12 Jan 2006 20:04:34 -0000 1.213
@@ -717,7 +717,7 @@
if ((sh_video=demuxer->video->sh) && sh_video->bih){
int biComp=le2me_32(sh_video->bih->biCompression);
- mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n",
+ mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %dx%d %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n",
(char *)&biComp,
sh_video->bih->biWidth,
sh_video->bih->biHeight,
Index: muxer_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_avi.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- muxer_avi.c 29 Nov 2005 22:04:57 -0000 1.33
+++ muxer_avi.c 12 Jan 2006 20:04:34 -0000 1.34
@@ -531,7 +531,7 @@
} else {
if (ftello(f) != MOVIALIGN) {
mp_msg(MSGT_MUXER, MSGL_ERR, "Opendml superindex is too big for reserved space!\n");
- mp_msg(MSGT_MUXER, MSGL_ERR, "Expected filepos %d, real filepos %d, missing space %d\n", MOVIALIGN, ftell(muxer->file), ftell(muxer->file)-MOVIALIGN);
+ mp_msg(MSGT_MUXER, MSGL_ERR, "Expected filepos %d, real filepos %ld, missing space %ld\n", MOVIALIGN, ftell(muxer->file), ftell(muxer->file)-MOVIALIGN);
mp_msg(MSGT_MUXER, MSGL_ERR, "Try increasing MOVIALIGN in libmpdemux/muxer_avi.c\n");
}
write_avi_list(f,listtypeAVIMOVIE,muxer->movi_end-ftello(f)-12);
Index: muxer_mpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- muxer_mpeg.c 3 Jan 2006 22:14:27 -0000 1.29
+++ muxer_mpeg.c 12 Jan 2006 20:04:34 -0000 1.30
@@ -1779,7 +1779,7 @@
case 60060:
return 1536000;
default:
- mp_msg(MSGT_MUXER, MSGL_ERR, "ERROR! unknown fps code: %d", fps);
+ mp_msg(MSGT_MUXER, MSGL_ERR, "ERROR! unknown fps code: %d", (int)(fps*1001+0.5));
return 0;
}
}
Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- tvi_v4l.c 18 Nov 2005 14:39:20 -0000 1.75
+++ tvi_v4l.c 12 Jan 2006 20:04:34 -0000 1.76
@@ -437,7 +437,7 @@
priv->audio_skew_buffer = NULL;
priv->video_fd = open(priv->video_device, O_RDWR);
- mp_msg(MSGT_TV, MSGL_DBG2, "Video fd: %d, %x\n", priv->video_fd,
+ mp_msg(MSGT_TV, MSGL_DBG2, "Video fd: %d, %p\n", priv->video_fd,
priv->video_device);
if (priv->video_fd == -1)
{
- Previous message: [MPlayer-cvslog] CVS: main/vidix/drivers savage_vid.c,1.3,1.4
- Next message: [MPlayer-cvslog] CVS: main/libvo vo_dga.c, 1.74, 1.75 vo_dxr3.c, 1.126, 1.127 vo_gif89a.c, 1.16, 1.17 x11_common.c, 1.202, 1.203
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list