Mercurial > mplayer.hg
changeset 34144:beafae9de2be
Employ correct off_t printf conversion specifiers; this time without typos.
This fixes a handful of warnings like
libmpcodecs/ve_vfw.c:150:7: warning: format '%d' expects type 'int', but argument 4 has type '__off64_t'
| author | diego |
|---|---|
| date | Fri, 21 Oct 2011 15:44:58 +0000 |
| parents | 3f73c0da20c7 |
| children | 698330cc961b |
| files | libmpcodecs/ve_vfw.c libmpdemux/demux_nsv.c libmpdemux/muxer_avi.c stream/stream.h stream/stream_vstream.c sub/vobsub.c |
| diffstat | 6 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ve_vfw.c Fri Oct 21 15:44:56 2011 +0000 +++ b/libmpcodecs/ve_vfw.c Fri Oct 21 15:44:58 2011 +0000 @@ -147,7 +147,7 @@ return NULL; } fclose(fd); - mp_msg(MSGT_WIN32,MSGL_ERR,"Compressor data %"PRIu64"d bytes\n", st.st_size); + mp_msg(MSGT_WIN32,MSGL_ERR,"Compressor data %"PRIu64" bytes\n", st.st_size); if (!(temp_len = (unsigned int) ICSendMessage(encoder_hic, ICM_SETSTATE, (LPARAM) drvdata, (int) st.st_size))){ mp_msg(MSGT_WIN32,MSGL_ERR,"ICSetState failed!\n"); free(drvdata);
--- a/libmpdemux/demux_nsv.c Fri Oct 21 15:44:56 2011 +0000 +++ b/libmpdemux/demux_nsv.c Fri Oct 21 15:44:58 2011 +0000 @@ -76,7 +76,7 @@ // sometimes instead of 0xBEEF as described for the next audio/video chunk we get // a whole new header - mp_dbg(MSGT_DEMUX, MSGL_DBG2, "demux_nsv: %08X %08"PRIu64"X\n", + mp_dbg(MSGT_DEMUX, MSGL_DBG2, "demux_nsv: %08X %08"PRIX64"\n", hdr[0] << 8 | hdr[1], stream_tell(demuxer->stream)); switch(hdr[0]<<8|hdr[1]) { case 0x4E53:
--- a/libmpdemux/muxer_avi.c Fri Oct 21 15:44:56 2011 +0000 +++ b/libmpdemux/muxer_avi.c Fri Oct 21 15:44:58 2011 +0000 @@ -487,7 +487,7 @@ if (stream_tell(muxer->stream) != 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 %"PRIu64"d, missing space %"PRIu64"d\n", + "Expected filepos %d, real filepos %"PRIu64", missing space %"PRIu64"\n", MOVIALIGN, stream_tell(muxer->stream), stream_tell(muxer->stream) - MOVIALIGN); mp_msg(MSGT_MUXER, MSGL_ERR, "Try increasing MOVIALIGN in libmpdemux/muxer_avi.c\n"); }
--- a/stream/stream.h Fri Oct 21 15:44:56 2011 +0000 +++ b/stream/stream.h Fri Oct 21 15:44:58 2011 +0000 @@ -294,11 +294,11 @@ inline static int stream_seek(stream_t *s,off_t pos){ - mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%llX\n", (long long)pos); + mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%"PRIX64"\n", pos); if (pos < 0) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "Invalid seek to negative position %llx!\n", - (long long)pos); + mp_msg(MSGT_DEMUX, MSGL_ERR, + "Invalid seek to negative position %"PRIx64"!\n", pos); pos = 0; } if(pos<s->pos){
--- a/stream/stream_vstream.c Fri Oct 21 15:44:56 2011 +0000 +++ b/stream/stream_vstream.c Fri Oct 21 15:44:58 2011 +0000 @@ -153,7 +153,7 @@ stream->start_pos = 0; stream->end_pos = vstream_streamsize(); - mp_msg(MSGT_OPEN, MSGL_DBG2, "Tivo stream size is %"PRIu64"d\n", stream->end_pos); + mp_msg(MSGT_OPEN, MSGL_DBG2, "Tivo stream size is %"PRIu64"\n", stream->end_pos); stream->priv = p; stream->fill_buffer = fill_buffer;
--- a/sub/vobsub.c Fri Oct 21 15:44:56 2011 +0000 +++ b/sub/vobsub.c Fri Oct 21 15:44:58 2011 +0000 @@ -696,7 +696,7 @@ { int h, m, s, ms; off_t filepos; - if (sscanf(line, " %02d:%02d:%02d:%03d, filepos: %09"PRIu64"x", + if (sscanf(line, " %02d:%02d:%02d:%03d, filepos: %09"PRIx64"", &h, &m, &s, &ms, &filepos) != 5) return -1; return vobsub_add_timestamp(vob, filepos, vob->delay + ms + 1000 * (s + 60 * (m + 60 * h)));