summaryrefslogtreecommitdiffstats
path: root/libmpdemux/aviheader.c
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-12 20:04:36 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-12 20:04:36 +0000
commit2601de41209ebed1abf2e577e109056fbe9d1211 (patch)
tree3334f5e9eaa592f7f2552257bd4cf085590a2e66 /libmpdemux/aviheader.c
parentb0beff56ac92032ffeff5116138d5d380a8b1c06 (diff)
downloadmpv-2601de41209ebed1abf2e577e109056fbe9d1211.tar.bz2
mpv-2601de41209ebed1abf2e577e109056fbe9d1211.tar.xz
massive attack: mp_msg printf format fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/aviheader.c')
-rw-r--r--libmpdemux/aviheader.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c
index 1b059a34b6..05acd428d1 100644
--- a/libmpdemux/aviheader.c
+++ b/libmpdemux/aviheader.c
@@ -238,7 +238,7 @@ while(1){
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 @@ while(1){
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 @@ while(1){
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){