diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-06-30 22:05:50 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-01 03:37:34 +0300 |
| commit | 480f3fb8d01fa3e3ed6e3b25c5c05bca1a152706 (patch) | |
| tree | 91fe4a44e9830ecbe2b708728d8f15f5891156b0 /libmpdemux | |
| parent | 48891debe232da0de062ac248a36c8257c1633ac (diff) | |
| download | mpv-480f3fb8d01fa3e3ed6e3b25c5c05bca1a152706.tar.bz2 mpv-480f3fb8d01fa3e3ed6e3b25c5c05bca1a152706.tar.xz | |
cleanup: fix mp_dbg() format string warnings
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mpg.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_nsv.c | 3 | ||||
| -rw-r--r-- | libmpdemux/demux_viv.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 16 |
4 files changed, 7 insertions, 16 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 93ee4106aa..44ec85d2db 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -261,7 +261,7 @@ static unsigned long long read_mpeg_timestamp(stream_t *s,int c){ return 0; // invalid pts } pts=(((uint64_t)((c>>1)&7))<<30)|((d>>1)<<15)|(e>>1); - mp_dbg(MSGT_DEMUX,MSGL_DBG3," pts {%"PRIu64"}",pts); + mp_dbg(MSGT_DEMUX,MSGL_DBG3," pts {%llu}",pts); return pts; } diff --git a/libmpdemux/demux_nsv.c b/libmpdemux/demux_nsv.c index 40ed1d06d6..9ab68dd894 100644 --- a/libmpdemux/demux_nsv.c +++ b/libmpdemux/demux_nsv.c @@ -74,7 +74,8 @@ static int demux_nsv_fill_buffer ( demuxer_t *demuxer, demux_stream_t *ds ) // 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 %08X\n",hdr[0]<<8|hdr[1],stream_tell(demuxer->stream)); + mp_dbg(MSGT_DEMUX, MSGL_DBG2, "demux_nsv: %08X %08X\n", + hdr[0]<<8|hdr[1], (unsigned int)stream_tell(demuxer->stream)); switch(hdr[0]<<8|hdr[1]) { case 0x4E53: if(hdr[2]==0x56 && hdr[3]==0x73){ diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 0f14033976..7da37ac01c 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -126,7 +126,7 @@ static void vivo_parse_text_header(demuxer_t *demux, int header_len) token, (int64_t)stream_tell(demux->stream)); break; } - mp_dbg(MSGT_DEMUX, MSGL_DBG3, "token: '%s' (%d bytes/%d bytes left)\n", + mp_dbg(MSGT_DEMUX, MSGL_DBG3, "token: '%s' (%zd bytes/%d bytes left)\n", token, strlen(token), header_len); mp_dbg(MSGT_DEMUX, MSGL_DBG3, "token => o: '%s', p: '%s'\n", opt, param); diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index f879938bfc..f2746a465e 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -632,19 +632,9 @@ int ds_fill_buffer(demux_stream_t *ds) if (ds->current) free_demux_packet(ds->current); ds->current = NULL; - if (mp_msg_test(MSGT_DEMUXER, MSGL_DBG3)) { - if (ds == demux->audio) - mp_dbg(MSGT_DEMUXER, MSGL_DBG3, - "ds_fill_buffer(d_audio) called\n"); - else if (ds == demux->video) - mp_dbg(MSGT_DEMUXER, MSGL_DBG3, - "ds_fill_buffer(d_video) called\n"); - else if (ds == demux->sub) - mp_dbg(MSGT_DEMUXER, MSGL_DBG3, "ds_fill_buffer(d_sub) called\n"); - else - mp_dbg(MSGT_DEMUXER, MSGL_DBG3, - "ds_fill_buffer(unknown 0x%X) called\n", (unsigned int) ds); - } + mp_dbg(MSGT_DEMUXER, MSGL_DBG3, "ds_fill_buffer (%s) called\n", + ds == demux->audio ? "d_audio" : ds == demux->video ? "d_video" : + ds == demux->sub ? "d_sub" : "unknown"); while (1) { if (ds->packs) { demux_packet_t *p = ds->first; |