[MPlayer-cvslog] r33929 - in trunk: help/help_mp-cs.h help/help_mp-de.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h help/help_mp-pl.h help/help_mp-ru.h help/help_mp-tr....

diego subversion at mplayerhq.hu
Wed Jul 27 15:40:06 CEST 2011


Author: diego
Date: Wed Jul 27 15:40:06 2011
New Revision: 33929

Log:
cleanup: adjust printf format strings to match parameter types

This eliminates a bunch of related compiler warnings.

Modified:
   trunk/libmenu/menu_dvbin.c
   trunk/libmpcodecs/vd_xanim.c
   trunk/libmpdemux/aviheader.c
   trunk/libmpdemux/demux_lmlm4.c
   trunk/libmpdemux/demux_mpg.c
   trunk/libmpdemux/demux_viv.c
   trunk/libmpdemux/mf.c
   trunk/libmpdemux/muxer_mpeg.c
   trunk/libmpdemux/video.c
   trunk/loader/qtx/qtxsdk/components.h
   trunk/stream/http.c

Changes in other areas also in this revision:
Modified:
   trunk/help/help_mp-cs.h
   trunk/help/help_mp-de.h
   trunk/help/help_mp-en.h
   trunk/help/help_mp-es.h
   trunk/help/help_mp-fr.h
   trunk/help/help_mp-hu.h
   trunk/help/help_mp-it.h
   trunk/help/help_mp-pl.h
   trunk/help/help_mp-ru.h
   trunk/help/help_mp-tr.h
   trunk/help/help_mp-zh_CN.h
   trunk/help/help_mp-zh_TW.h

Modified: trunk/libmenu/menu_dvbin.c
==============================================================================
--- trunk/libmenu/menu_dvbin.c	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/libmenu/menu_dvbin.c	Wed Jul 27 15:40:06 2011	(r33929)
@@ -125,7 +125,7 @@ static int fill_channels_menu(menu_t *me
 		}
 		else
 		{
-			mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_menu: fill_menu: couldn't malloc %zd bytes for menu item: %s, exit\n",
+			mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_menu: fill_menu: couldn't malloc %zu bytes for menu item: %s, exit\n",
 					sizeof(list_entry_t), strerror(errno));
 			break;
 		}
@@ -155,7 +155,7 @@ static int fill_cards_menu(menu_t *menu,
 		}
 		else
 		{
-			fprintf(stderr, "dvb_menu: fill_menu: couldn't malloc %zd bytes for menu item: %s, exit\n",
+			fprintf(stderr, "dvb_menu: fill_menu: couldn't malloc %zu bytes for menu item: %s, exit\n",
 				sizeof(list_entry_t), strerror(errno));
 			if(n)
 				return 1;

Modified: trunk/libmpcodecs/vd_xanim.c
==============================================================================
--- trunk/libmpcodecs/vd_xanim.c	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/libmpcodecs/vd_xanim.c	Wed Jul 27 15:40:06 2011	(r33929)
@@ -264,7 +264,8 @@ static int xacodec_load(sh_video_t *sh, 
 
     if (mod_hdr->api_rev > XAVID_API_REV)
     {
-	mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: not supported api revision (%d) in %s\n",
+	mp_msg(MSGT_DECVIDEO, MSGL_FATAL,
+	   "xacodec: not supported api revision (%u) in %s\n",
 	    mod_hdr->api_rev, filename);
 	dlclose(priv->file_handler);
 	return 0;
@@ -278,27 +279,28 @@ static int xacodec_load(sh_video_t *sh, 
 	return 0;
     }
 
-    mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Exported functions by codec: [functable: %p entries: %d]\n",
+    mp_msg(MSGT_DECVIDEO, MSGL_DBG2,
+	"Exported functions by codec: [functable: %p entries: %u]\n",
 	mod_hdr->funcs, mod_hdr->num_funcs);
     for (i = 0; i < (int)mod_hdr->num_funcs; i++)
     {
-	mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %d: %d %d [iq:%p d:%p]\n",
+	mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %d: %u %u [iq:%p d:%p]\n",
 		i, func[i].what, func[i].id, func[i].iq_func, func[i].dec_func);
 	if (func[i].what & XAVID_AVI_QUERY)
 	{
-	    mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: avi init/query func (id: %d)\n",
+	    mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: avi init/query func (id: %u)\n",
 		func[i].iq_func, func[i].id);
 	    priv->iq_func = func[i].iq_func;
 	}
 	if (func[i].what & XAVID_QT_QUERY)
 	{
-	    mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: qt init/query func (id: %d)\n",
+	    mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: qt init/query func (id: %u)\n",
 		func[i].iq_func, func[i].id);
 	    priv->iq_func = func[i].iq_func;
 	}
 	if (func[i].what & XAVID_DEC_FUNC)
 	{
-	    mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: decoder func (init/query: %p) (id: %d)\n",
+	    mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: decoder func (init/query: %p) (id: %u)\n",
 		func[i].dec_func, func[i].iq_func, func[i].id);
 	    priv->dec_func = func[i].dec_func;
 	}
@@ -476,7 +478,8 @@ static void XA_2x2_OUT_4BLKS_Convert(uns
 
 void *YUV2x2_Blk_Func(unsigned int image_type, int blks, unsigned int dith_flag)
 {
-    mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "YUV2x2_Blk_Func(image_type=%d, blks=%d, dith_flag=%d)\n",
+    mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,
+	"YUV2x2_Blk_Func(image_type=%u, blks=%d, dith_flag=%u)\n",
 	image_type, blks, dith_flag);
     switch(blks){
     case 1:
@@ -485,7 +488,9 @@ void *YUV2x2_Blk_Func(unsigned int image
 	return (void*) XA_2x2_OUT_4BLKS_Convert;
     }
 
-    mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Unimplemented: YUV2x2_Blk_Func(image_type=%d  blks=%d  dith=%d)\n",image_type,blks,dith_flag);
+    mp_msg(MSGT_DECVIDEO, MSGL_WARN,
+           "Unimplemented: YUV2x2_Blk_Func(image_type=%u  blks=%d  dith=%u)\n",
+           image_type, blks, dith_flag);
     return (void*) XA_dummy;
 }
 
@@ -496,8 +501,9 @@ static void XA_YUV_2x2_clr(XA_2x2_Color 
     unsigned int map_flag, unsigned int *map, XA_CHDR *chdr)
 {
 
-  mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "XA_YUV_2x2_clr(%p [%d,%d,%d,%d][%d][%d] %d %p %p)\n",
-          cmap2x2,Y0,Y1,Y2,Y3,U,V,map_flag,map,chdr);
+  mp_dbg(MSGT_DECVIDEO, MSGL_DBG3,
+         "XA_YUV_2x2_clr(%p [%u,%u,%u,%u][%u][%u] %u %p %p)\n",
+         cmap2x2, Y0, Y1, Y2, Y3, U, V, map_flag, map, chdr);
 
   cmap2x2->clr0_0=Y0;
   cmap2x2->clr0_1=Y1;
@@ -510,8 +516,9 @@ static void XA_YUV_2x2_clr(XA_2x2_Color 
 
 void *YUV2x2_Map_Func(unsigned int image_type, unsigned int dith_type)
 {
-    mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "YUV2x2_Map_Func('image_type: %d', 'dith_type: %d')",
-	    image_type, dith_type);
+    mp_dbg(MSGT_DECVIDEO, MSGL_DBG2,
+           "YUV2x2_Map_Func('image_type: %u', 'dith_type: %u')",
+           image_type, dith_type);
     return (void*)XA_YUV_2x2_clr;
 }
 
@@ -554,17 +561,19 @@ static void XA_YUV1611_Convert(unsigned 
     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:  %lu %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: %u', 'imagey: %u', 'i_x: %u', 'i_y: %u', 'yuv_bufs: %p', 'yuv_tabs: %p', 'map_flag: %u', '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 (%u) %hux%hu %hux%hu\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);
 
@@ -617,7 +626,7 @@ static void XA_YUV1611_Convert(unsigned 
 
 void *XA_YUV1611_Func(unsigned int image_type)
 {
-    mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "XA_YUV1611_Func('image_type: %d')", image_type);
+    mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "XA_YUV1611_Func('image_type: %u')", image_type);
     return (void *)XA_YUV1611_Convert;
 }
 
@@ -634,11 +643,12 @@ static void XA_YUV221111_Convert(unsigne
     int ystride=imagex; //(yuv->y_w)?yuv->y_w:imagex;
     int uvstride=imagex/2; //(yuv->uv_w)?yuv->uv_w:(imagex/2);
 
-    mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "XA_YUV221111_Convert(%p  %dx%d %d;%d [%dx%d]  %p %p %d %p %p)\n",
+    mp_dbg(MSGT_DECVIDEO, MSGL_DBG3,
+	"XA_YUV221111_Convert(%p  %ux%u %u;%u [%dx%d]  %p %p %u %p %p)\n",
 	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) %hXx%hX %hXx%hX\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);
 
@@ -655,7 +665,7 @@ static void XA_YUV221111_Convert(unsigne
 
 void *XA_YUV221111_Func(unsigned int image_type)
 {
-    mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "XA_YUV221111_Func('image_type: %d')\n",image_type);
+    mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "XA_YUV221111_Func('image_type: %u')\n",image_type);
     return (void *)XA_YUV221111_Convert;
 }
 
@@ -725,7 +735,8 @@ static int init(sh_video_t *sh)
 		vo_format_name(sh->codec->outfmt[sh->outfmtidx]));
 	    return 0;
     }
-    mp_msg(MSGT_DECVIDEO, MSGL_INFO, "xacodec: querying for input %dx%d %dbit [fourcc: %4x] (%s)...\n",
+    mp_msg(MSGT_DECVIDEO, MSGL_INFO,
+           "xacodec: querying for input %ux%u %ubit [fourcc: %4x] (%s)...\n",
 	codec_hdr.x, codec_hdr.y, codec_hdr.depth, codec_hdr.compression, codec_hdr.description);
 
     if (xacodec_query(sh, &codec_hdr) == 0)

Modified: trunk/libmpdemux/aviheader.c
==============================================================================
--- trunk/libmpdemux/aviheader.c	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/libmpdemux/aviheader.c	Wed Jul 27 15:40:06 2011	(r33929)
@@ -269,7 +269,7 @@ while(1){
       if(last_fccType==streamtypeVIDEO){
         sh_video->bih=calloc(FFMAX(chunksize, sizeof(*sh_video->bih)), 1);
 //        sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize);
-        mp_msg(MSGT_HEADER, MSGL_V, "Found 'bih', %u bytes of %d\n",
+        mp_msg(MSGT_HEADER, MSGL_V, "Found 'bih', %u bytes of %zu\n",
                chunksize, sizeof(*sh_video->bih));
         stream_read(demuxer->stream,(char*) sh_video->bih,chunksize);
 	le2me_BITMAPINFOHEADER(sh_video->bih);  // swap to machine endian
@@ -326,7 +326,7 @@ while(1){
 	unsigned wf_size = chunksize<sizeof(*sh_audio->wf)?sizeof(*sh_audio->wf):chunksize;
         sh_audio->wf=calloc(wf_size,1);
 //        sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize);
-        mp_msg(MSGT_HEADER, MSGL_V, "Found 'wf', %d bytes of %d\n",
+        mp_msg(MSGT_HEADER, MSGL_V, "Found 'wf', %u bytes of %zu\n",
                chunksize, sizeof(*sh_audio->wf));
         stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize);
 	le2me_WAVEFORMATEX(sh_audio->wf);

Modified: trunk/libmpdemux/demux_lmlm4.c
==============================================================================
--- trunk/libmpdemux/demux_lmlm4.c	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/libmpdemux/demux_lmlm4.c	Wed Jul 27 15:40:06 2011	(r33929)
@@ -73,7 +73,7 @@ static int imeHeaderValid(FrameInfo *fra
          frame->frameSize > MAX_PACKET_SIZE || frame->frameSize <= 0)
     {
         mp_msg(MSGT_DEMUX, MSGL_V,
-               "Invalid packet in LMLM4 stream: ch=%d size=%zd\n",
+               "Invalid packet in LMLM4 stream: ch=%d size=%zu\n",
                frame->channelNo, frame->frameSize);
         return 0;
     }
@@ -158,7 +158,7 @@ static int getFrame(demuxer_t *demuxer, 
     frameInfo->frameSize = packetSize - 8; //sizeof(IME6400Header);
     frameInfo->paddingSize = (packetSize & PACKET_BLOCK_LAST) ? PACKET_BLOCK_SIZE - (packetSize & PACKET_BLOCK_LAST) : 0;
 
-    mp_msg(MSGT_DEMUX, MSGL_DBG2, "typ: %d chan: %d size: %zd pad: %zd\n",
+    mp_msg(MSGT_DEMUX, MSGL_DBG2, "typ: %d chan: %d size: %zu pad: %zu\n",
             frameInfo->frameType,
             frameInfo->channelNo,
             frameInfo->frameSize,

Modified: trunk/libmpdemux/demux_mpg.c
==============================================================================
--- trunk/libmpdemux/demux_mpg.c	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/libmpdemux/demux_mpg.c	Wed Jul 27 15:40:06 2011	(r33929)
@@ -262,7 +262,7 @@ static unsigned long long read_mpeg_time
     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;
 }
 

Modified: trunk/libmpdemux/demux_viv.c
==============================================================================
--- trunk/libmpdemux/demux_viv.c	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/libmpdemux/demux_viv.c	Wed Jul 27 15:40:06 2011	(r33929)
@@ -128,7 +128,7 @@ static void vivo_parse_text_header(demux
 		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' (%zu bytes/%d bytes left)\n",
 	    token, strlen(token), header_len);
 	mp_dbg(MSGT_DEMUX, MSGL_DBG3, "token => o: '%s', p: '%s'\n",
 	    opt, param);

Modified: trunk/libmpdemux/mf.c
==============================================================================
--- trunk/libmpdemux/mf.c	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/libmpdemux/mf.c	Wed Jul 27 15:40:06 2011	(r33929)
@@ -127,7 +127,7 @@ mf_t* open_mf(char * filename){
    mf->nr_of_files=gg.gl_pathc;
    mf->names=calloc( gg.gl_pathc, sizeof( char* ) );
 
-   mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d (%d)\n",mf->nr_of_files, gg.gl_pathc * sizeof( char* ) );
+   mp_msg( MSGT_STREAM, MSGL_INFO, "[mf] number of files: %d (%zu)\n", mf->nr_of_files, gg.gl_pathc * sizeof( char* ) );
 
    for( i=0;i < gg.gl_pathc;i++ )
     {

Modified: trunk/libmpdemux/muxer_mpeg.c
==============================================================================
--- trunk/libmpdemux/muxer_mpeg.c	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/libmpdemux/muxer_mpeg.c	Wed Jul 27 15:40:06 2011	(r33929)
@@ -1653,7 +1653,7 @@ static size_t parse_mpeg12_video(muxer_s
 	mp_msg(MSGT_MUXER, MSGL_DBG2,"parse_mpeg12_video, len=%u\n", (uint32_t) len);
 	if(s->buffer[0] != 0 || s->buffer[1] != 0 || s->buffer[2] != 1 || len<6)
 	{
-		mp_msg(MSGT_MUXER, MSGL_ERR,"Unknown video format, possibly non-MPEG1/2 stream, len=%zd!\n", len);
+		mp_msg(MSGT_MUXER, MSGL_ERR,"Unknown video format, possibly non-MPEG1/2 stream, len=%zu!\n", len);
 		return 0;
 	}
 
@@ -1777,7 +1777,7 @@ static size_t parse_mpeg12_video(muxer_s
 	ret = add_frame(spriv, spriv->delta_pts, s->buffer, len, pt, spriv->last_dts, spriv->last_pts);
 	if(ret < 0)
 	{
-		mp_msg(MSGT_MUXER, MSGL_FATAL, "\r\nPARSE_MPEG12: add_frames(%zd) failed, exit\r\n", len);
+		mp_msg(MSGT_MUXER, MSGL_FATAL, "\r\nPARSE_MPEG12: add_frames(%zu) failed, exit\r\n", len);
 		return 0;
 	}
 	mp_msg(MSGT_MUXER, MSGL_DBG2, "\r\nVIDEO FRAME, PT: %C, tr: %d, diff: %d, dts: %.3f, pts: %.3f, pdt: %u, gop_reset: %d\r\n",
@@ -1866,7 +1866,7 @@ static size_t parse_mpeg4_video(muxer_st
 	mp_msg(MSGT_MUXER, MSGL_DBG2,"parse_mpeg4_video, len=%u\n", (uint32_t) len);
 	if(len<6)
 	{
-		mp_msg(MSGT_MUXER, MSGL_ERR,"Frame too short: %zd, exit!\n", len);
+		mp_msg(MSGT_MUXER, MSGL_ERR,"Frame too short: %zu, exit!\n", len);
 		return 0;
 	}
 
@@ -1923,7 +1923,7 @@ static size_t parse_mpeg4_video(muxer_st
 	ret = add_frame(vpriv, delta_pts, s->buffer, len, pt, vpriv->last_dts, vpriv->last_pts);
 	if(ret < 0)
 	{
-		mp_msg(MSGT_MUXER, MSGL_FATAL, "\r\nPARSE_MPEG4: add_frames(%zd) failed, exit\r\n", len);
+		mp_msg(MSGT_MUXER, MSGL_FATAL, "\r\nPARSE_MPEG4: add_frames(%zu) failed, exit\r\n", len);
 		return 0;
 	}
 
@@ -2355,7 +2355,7 @@ static void mpegfile_write_chunk(muxer_s
 			tmp = realloc(s->b_buffer, len  + s->b_buffer_len);
 			if(!tmp)
 			{
-				mp_msg(MSGT_MUXER, MSGL_FATAL, "\nFATAL! couldn't realloc %zd bytes\n", len  + s->b_buffer_len);
+				mp_msg(MSGT_MUXER, MSGL_FATAL, "\nFATAL! couldn't realloc %zu bytes\n", len  + s->b_buffer_len);
 				return;
 			}
 			s->b_buffer = tmp;

Modified: trunk/libmpdemux/video.c
==============================================================================
--- trunk/libmpdemux/video.c	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/libmpdemux/video.c	Wed Jul 27 15:40:06 2011	(r33929)
@@ -386,7 +386,7 @@ mpeg_header_parser:
    if(mp_vc1_decode_sequence_header(&picture, &videobuffer[4], videobuf_len-4)) {
      sh_video->bih = calloc(1, sizeof(*sh_video->bih) + videobuf_len);
      if(sh_video->bih == NULL) {
-       mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Couldn't alloc %d bytes for VC-1 extradata!\n", sizeof(*sh_video->bih) + videobuf_len);
+       mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Couldn't alloc %zu bytes for VC-1 extradata!\n", sizeof(*sh_video->bih) + videobuf_len);
        return 0;
      }
      sh_video->bih->biSize= sizeof(*sh_video->bih) + videobuf_len;

Modified: trunk/loader/qtx/qtxsdk/components.h
==============================================================================
--- trunk/loader/qtx/qtxsdk/components.h	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/loader/qtx/qtxsdk/components.h	Wed Jul 27 15:40:06 2011	(r33929)
@@ -736,13 +736,13 @@ static inline void dump_CodecDecompressP
     if(cd->wantedDestinationPixelTypes){
 	unsigned int* p=cd->wantedDestinationPixelTypes;
 	while(p[0]){
-	    printf("  0x%08X %.4s\n",p[0],&p[0]);
+	    printf("  0x%08X %p\n",p[0],&p[0]);
 	    ++p;
 	}
     }
     printf("screenFloodMethod=%d value=%d  preferredOffscreenPixelSize=%d\n",
 	cd->screenFloodMethod, cd->screenFloodValue, cd->preferredOffscreenPixelSize);
-    printf("callbacks: progress=%p compl=%p data=%p ftime=%p srcdata=%p sync=%p\n",
+    printf("callbacks: progress=%"PRId64" compl=%"PRId64" data=%"PRId64" ftime=%p srcdata=%p sync=%p\n",
      cd->progressProcRecord, cd->completionProcRecord,
      cd->dataProcRecord, cd->frameTime, cd->sourceData, cd->syncFrameTime);
 //    printf("\n");

Modified: trunk/stream/http.c
==============================================================================
--- trunk/stream/http.c	Wed Jul 27 15:40:00 2011	(r33928)
+++ trunk/stream/http.c	Wed Jul 27 15:40:06 2011	(r33929)
@@ -674,7 +674,7 @@ http_debug_hdr( HTTP_header_t *http_hdr 
 	mp_msg(MSGT_NETWORK,MSGL_V,"method:             [%s]\n", http_hdr->method );
 	mp_msg(MSGT_NETWORK,MSGL_V,"status code:        [%d]\n", http_hdr->status_code );
 	mp_msg(MSGT_NETWORK,MSGL_V,"reason phrase:      [%s]\n", http_hdr->reason_phrase );
-	mp_msg(MSGT_NETWORK,MSGL_V,"body size:          [%zd]\n", http_hdr->body_size );
+	mp_msg(MSGT_NETWORK,MSGL_V,"body size:          [%zu]\n", http_hdr->body_size );
 
 	mp_msg(MSGT_NETWORK,MSGL_V,"Fields:\n");
 	field = http_hdr->first_field;


More information about the MPlayer-cvslog mailing list