mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

cleanup: fix mp_dbg() format string warnings

Browse Source
This commit is contained in:
Clément Bœsch 2011-06-30 22:05:50 +02:00 committed by Uoti Urpala
parent 48891debe2
commit 480f3fb8d0
5 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmpcodecs/vd_xanim.c
View File

@ -554,17 +554,17 @@ static void XA_YUV1611_Convert(unsigned char *image_p, unsigned int imagex, unsi
int ystride=(yuv->y_w)?yuv->y_w:imagex;
int uvstride=(yuv->uv_w)?yuv->uv_w:(imagex/4);
mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "YUVTabs: %d %p %p %p %p %p\n",yuv_tabs->Uskip_mask,
mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "YUVTabs: %ld %p %p %p %p %p\n",yuv_tabs->Uskip_mask,
yuv_tabs->YUV_Y_tab,
yuv_tabs->YUV_UB_tab,
yuv_tabs->YUV_VR_tab,
yuv_tabs->YUV_UG_tab,
yuv_tabs->YUV_VG_tab );
mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "XA_YUV1611_Convert('image: %08x', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')",
mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "XA_YUV1611_Convert('image: %p', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %p', 'yuv_tabs: %p', 'map_flag: %d', 'map: %p', 'chdr: %p')",
image_p, imagex, imagey, i_x, i_y, yuv, yuv_tabs, map_flag, map, chdr);
mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "YUV: %p %p %p %X (%d) %dx%d %dx%d\n",
mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "YUV: %p %p %p %p (%d) %dx%d %dx%d\n",
yuv->Ybuf,yuv->Ubuf,yuv->Vbuf,yuv->the_buf,yuv->the_buf_size,
yuv->y_w,yuv->y_h,yuv->uv_w,yuv->uv_h);
@ -638,7 +638,7 @@ static void XA_YUV221111_Convert(unsigned char *image_p, unsigned int imagex, un
image_p,imagex,imagey,i_x,i_y, sh->disp_w, sh->disp_h,
yuv,yuv_tabs,map_flag,map,chdr);
mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "YUV: %p %p %p %X (%X) %Xx%X %Xx%X\n",
mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "YUV: %p %p %p %p (%X) %Xx%X %Xx%X\n",
yuv->Ybuf,yuv->Ubuf,yuv->Vbuf,yuv->the_buf,yuv->the_buf_size,
yuv->y_w,yuv->y_h,yuv->uv_w,yuv->uv_h);

2
libmpdemux/demux_mpg.c
View File

@ -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;
}

3
libmpdemux/demux_nsv.c
View File

@ -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){

2
libmpdemux/demux_viv.c
View File

@ -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);

16
libmpdemux/demuxer.c
View File

@ -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;