[MPlayer-dev-eng] [PATCH] printf warning fixes (REPOST)
Dominik 'Rathann' Mierzejewski
dominik at rangers.eu.org
Tue Jan 3 03:50:55 CET 2006
Here's a current version of my patch that attempts to silence
most (if not all) printf format-related warnings.
Regards,
R.
--
MPlayer RPMs maintainer: http://rpm.greysector.net/mplayer/
"I am Grey. I stand between the candle and the star. We are Grey.
We stand between the darkness ... and the light."
-- Delenn in Grey Council in Babylon 5:"Babylon Squared"
-------------- next part --------------
--- MPlayer-20051225/help/help_mp-en.h.printf 2005-12-25 14:03:32.000000000 +0100
+++ MPlayer-20051225/help/help_mp-en.h 2005-12-25 14:09:37.000000000 +0100
@@ -257,7 +257,7 @@
#define MSGTR_AudioStreamResult "\nAudio stream: %8.3f kbit/s (%d B/s) size: %d bytes %5.3f secs\n"
#define MSGTR_OpenedStream "success: format: %d data: 0x%X - 0x%x\n"
#define MSGTR_VCodecFramecopy "videocodec: framecopy (%dx%d %dbpp fourcc=%x)\n"
-#define MSGTR_ACodecFramecopy "audiocodec: framecopy (format=%x chans=%d rate=%ld bits=%d B/s=%ld sample-%ld)\n"
+#define MSGTR_ACodecFramecopy "audiocodec: framecopy (format=%x chans=%d rate=%d bits=%d B/s=%d sample-%d)\n"
#define MSGTR_CBRPCMAudioSelected "CBR PCM audio selected\n"
#define MSGTR_MP3AudioSelected "MP3 audio selected\n"
#define MSGTR_CannotAllocateBytes "Couldn't allocate %d bytes\n"
@@ -267,7 +267,7 @@
#define MSGTR_LimitingAudioPreload "Limiting audio preload to 0.4s\n"
#define MSGTR_IncreasingAudioDensity "Increasing audio density to 4\n"
#define MSGTR_ZeroingAudioPreloadAndMaxPtsCorrection "Forcing audio preload to 0, max pts correction to 0\n"
-#define MSGTR_CBRAudioByterate "\n\nCBR audio: %ld bytes/sec, %d bytes/block\n"
+#define MSGTR_CBRAudioByterate "\n\nCBR audio: %d bytes/sec, %d bytes/block\n"
#define MSGTR_LameVersion "LAME version %s (%s)\n\n"
#define MSGTR_InvalidBitrateForLamePreset "Error: The bitrate specified is out of the valid range for this preset\n"\
"\n"\
@@ -580,7 +580,7 @@
#define MSGTR_LeaveTelecineMode "\ndemux_mpg: 30000/1001fps NTSC content detected, switching framerate.\n"
#define MSGTR_EnterTelecineMode "\ndemux_mpg: 24000/1001fps progressive NTSC content detected, switching framerate.\n"
-#define MSGTR_CacheFill "\rCache fill: %5.2f%% (%d bytes) "
+#define MSGTR_CacheFill "\rCache fill: %5.2f%% (%"PRId64" bytes) "
#define MSGTR_NoBindFound "No bind found for key '%s'"
#define MSGTR_FailedToOpen "Failed to open %s\n"
@@ -1209,7 +1209,7 @@
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Access type not available\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableSampleFmt "Sample format not available\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableChanCount "Channel count not available - reverting to default: %d\n"
-#define MSGTR_MPDEMUX_AIALSA_CannotInstallHWParams "Unable to install hw params:"
+#define MSGTR_MPDEMUX_AIALSA_CannotInstallHWParams "Unable to install hw params: %s"
#define MSGTR_MPDEMUX_AIALSA_PeriodEqualsBufferSize "Can't use period equal to buffer size (%u == %lu)\n"
#define MSGTR_MPDEMUX_AIALSA_CannotInstallSWParams "Unable to install sw params:\n"
#define MSGTR_MPDEMUX_AIALSA_ErrorOpeningAudio "Error opening audio: %s\n"
@@ -1313,7 +1313,7 @@
#define MSGTR_MPDEMUX_AVIHDR_RegeneratingKeyfTableForMPEG4 "Regenerating keyframe table for MPEG4 video\n"
#define MSGTR_MPDEMUX_AVIHDR_FoundWaveFmt "Found 'wf', %d bytes of %d\n"
#define MSGTR_MPDEMUX_AVIHDR_FoundAVIV2Header "AVI: dmlh found (size=%d) (total_frames=%d)\n"
-#define MSGTR_MPDEMUX_AVIHDR_ReadingIndexBlockChunksForFrames "Reading INDEX block, %d chunks for %ld frames (fpos=%p)\n"
+#define MSGTR_MPDEMUX_AVIHDR_ReadingIndexBlockChunksForFrames "Reading INDEX block, %d chunks for %d frames (fpos=%"PRId64")\n"
#define MSGTR_MPDEMUX_AVIHDR_AdditionalRIFFHdr "Additional RIFF header...\n"
#define MSGTR_MPDEMUX_AVIHDR_WarnNotExtendedAVIHdr "** warning: this is no extended AVI header..\n"
#define MSGTR_MPDEMUX_AVIHDR_BrokenChunk "Broken chunk? chunksize=%d (id=%.4s)\n"
@@ -1338,7 +1338,7 @@
#define MSGTR_MPDEMUX_CDDA_CantOpenCDDADevice "Can't open CDDA device.\n"
#define MSGTR_MPDEMUX_CDDA_CantOpenDisc "Can't open disc.\n"
-#define MSGTR_MPDEMUX_CDDA_AudioCDFoundWithNTracks "Found audio CD with %d tracks.\n"
+#define MSGTR_MPDEMUX_CDDA_AudioCDFoundWithNTracks "Found audio CD with %ld tracks.\n"
// cddb.c
--- MPlayer-20051225/liba52/parse.c.printf 2005-04-07 22:07:53.000000000 +0200
+++ MPlayer-20051225/liba52/parse.c 2005-12-25 14:09:37.000000000 +0100
@@ -37,6 +37,8 @@
#include "tables.h"
#include "mm_accel.h"
+#include "mp_msg.h"
+
#ifdef HAVE_MEMALIGN
/* some systems have memalign() but no declaration for it */
void * memalign (size_t align, size_t size);
@@ -71,7 +73,7 @@
#endif
if(((int)samples%16) && (mm_accel&MM_ACCEL_X86_SSE)){
mm_accel &=~MM_ACCEL_X86_SSE;
- printf("liba52: unable to get 16 byte aligned memory disabling usage of SSE instructions\n");
+ mp_msg(MSGT_DECAUDIO,MSGL_V,"liba52: unable to get 16 byte aligned memory disabling usage of SSE instructions\n");
}
if (samples == NULL)
--- MPlayer-20051225/libaf/af_resample.c.printf 2005-02-28 01:17:05.000000000 +0100
+++ MPlayer-20051225/libaf/af_resample.c 2005-12-25 14:09:37.000000000 +0100
@@ -182,7 +182,7 @@
if((s->setup & RSMP_MASK) == RSMP_LIN){
s->pt=0LL;
s->step=((uint64_t)n->rate<<STEPACCURACY)/(uint64_t)af->data->rate+1LL;
- af_msg(AF_MSG_DEBUG0,"[resample] Linear interpolation step: 0x%016X.\n",
+ af_msg(AF_MSG_DEBUG0,"[resample] Linear interpolation step: 0x%016llX.\n",
s->step);
af->mul.n = af->data->rate;
af->mul.d = n->rate;
--- MPlayer-20051225/libao2/ao_alsa.c.printf 2005-12-25 14:03:32.000000000 +0100
+++ MPlayer-20051225/libao2/ao_alsa.c 2005-12-25 14:09:37.000000000 +0100
@@ -610,11 +610,11 @@
if ((err = snd_pcm_hw_params_set_period_size_near(alsa_handler, alsa_hwparams,
&chunk_size, &dir)) < 0)
{
- mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to set periodsize(%d): %s\n",
+ mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to set periodsize(%ld): %s\n",
chunk_size, snd_strerror(err));
}
else {
- mp_msg(MSGT_AO,MSGL_V,"alsa-init: chunksize set to %i\n", chunk_size);
+ mp_msg(MSGT_AO,MSGL_V,"alsa-init: chunksize set to %li\n", chunk_size);
}
if ((err = snd_pcm_hw_params_set_periods_near(alsa_handler, alsa_hwparams,
&alsa_fragcount, &dir)) < 0) {
--- MPlayer-20051225/libmpcodecs/ve_vfw.c.printf 2005-11-20 01:06:16.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/ve_vfw.c 2005-12-25 14:09:37.000000000 +0100
@@ -129,21 +129,21 @@
// if(verbose) {
printf("Starting compression:\n");
printf(" Input format:\n");
- printf(" biSize %d\n", input_bih->biSize);
- printf(" biWidth %d\n", input_bih->biWidth);
- printf(" biHeight %d\n", input_bih->biHeight);
+ printf(" biSize %ld\n", input_bih->biSize);
+ printf(" biWidth %ld\n", input_bih->biWidth);
+ printf(" biHeight %ld\n", input_bih->biHeight);
printf(" biPlanes %d\n", input_bih->biPlanes);
printf(" biBitCount %d\n", input_bih->biBitCount);
- printf(" biCompression 0x%x ('%.4s')\n", input_bih->biCompression, (char *)&input_bih->biCompression);
- printf(" biSizeImage %d\n", input_bih->biSizeImage);
+ printf(" biCompression 0x%lx ('%.4s')\n", input_bih->biCompression, (char *)&input_bih->biCompression);
+ printf(" biSizeImage %ld\n", input_bih->biSizeImage);
printf(" Output format:\n");
- printf(" biSize %d\n", output_bih->biSize);
- printf(" biWidth %d\n", output_bih->biWidth);
- printf(" biHeight %d\n", output_bih->biHeight);
+ printf(" biSize %ld\n", output_bih->biSize);
+ printf(" biWidth %ld\n", output_bih->biWidth);
+ printf(" biHeight %ld\n", output_bih->biHeight);
printf(" biPlanes %d\n", output_bih->biPlanes);
printf(" biBitCount %d\n", output_bih->biBitCount);
- printf(" biCompression 0x%x ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression);
- printf(" biSizeImage %d\n", output_bih->biSizeImage);
+ printf(" biCompression 0x%lx ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression);
+ printf(" biSizeImage %ld\n", output_bih->biSizeImage);
// }
output_bih->biWidth=input_bih->biWidth;
@@ -164,13 +164,13 @@
mp_msg(MSGT_WIN32,MSGL_V,"ICCompressBegin OK\n");
printf(" Output format after query/begin:\n");
- printf(" biSize %d\n", output_bih->biSize);
- printf(" biWidth %d\n", output_bih->biWidth);
- printf(" biHeight %d\n", output_bih->biHeight);
+ printf(" biSize %ld\n", output_bih->biSize);
+ printf(" biWidth %ld\n", output_bih->biWidth);
+ printf(" biHeight %ld\n", output_bih->biHeight);
printf(" biPlanes %d\n", output_bih->biPlanes);
printf(" biBitCount %d\n", output_bih->biBitCount);
- printf(" biCompression 0x%x ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression);
- printf(" biSizeImage %d\n", output_bih->biSizeImage);
+ printf(" biCompression 0x%lx ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression);
+ printf(" biSizeImage %ld\n", output_bih->biSizeImage);
encoder_buf_size=input_bih->biSizeImage;
encoder_buf=malloc(encoder_buf_size);
--- MPlayer-20051225/libmpcodecs/vf.c.printf 2005-12-25 14:03:32.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/vf.c 2005-12-25 14:09:37.000000000 +0100
@@ -405,7 +405,7 @@
(mpi->flags&MP_IMGFLAG_YUV)?"YUV":((mpi->flags&MP_IMGFLAG_SWAPPED)?"BGR":"RGB"),
(mpi->flags&MP_IMGFLAG_PLANAR)?"planar":"packed",
mpi->bpp*mpi->width*mpi->height/8);
- mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"(imgfmt: %x, planes: %x,%x,%x strides: %d,%d,%d, chroma: %dx%d, shift: h:%d,v:%d)\n",
+ mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"(imgfmt: %x, planes: %p,%p,%p strides: %d,%d,%d, chroma: %dx%d, shift: h:%d,v:%d)\n",
mpi->imgfmt, mpi->planes[0], mpi->planes[1], mpi->planes[2],
mpi->stride[0], mpi->stride[1], mpi->stride[2],
mpi->chroma_width, mpi->chroma_height, mpi->chroma_x_shift, mpi->chroma_y_shift);
--- MPlayer-20051225/libmpcodecs/ve_lavc.c.printf 2005-12-07 22:52:32.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/ve_lavc.c 2005-12-25 14:09:37.000000000 +0100
@@ -342,7 +342,7 @@
mux_v->bih->biHeight=height;
mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
- printf("videocodec: libavcodec (%dx%d fourcc=%x [%.4s])\n",
+ mp_msg(MSGT_MENCODER, MSGL_INFO,"videocodec: libavcodec (%dx%d fourcc=%x [%.4s])\n",
mux_v->bih->biWidth, mux_v->bih->biHeight, mux_v->bih->biCompression,
(char *)&mux_v->bih->biCompression);
--- MPlayer-20051225/libmpcodecs/ve_xvid.c.printf 2005-11-20 01:06:16.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/ve_xvid.c 2005-12-25 14:09:37.000000000 +0100
@@ -173,7 +173,7 @@
fp->mux->bih->biHeight = height;
fp->mux->bih->biSizeImage = fp->mux->bih->biWidth * fp->mux->bih->biHeight * 3;
fp->mux->aspect = (float)d_width/d_height;
- mp_msg(MSGT_MENCODER,MSGL_INFO,"videocodec: XViD (%dx%d fourcc=%x [%.4s])\n",
+ mp_msg(MSGT_MENCODER,MSGL_INFO,"videocodec: XViD (%dx%d fourcc=%lx [%.4s])\n",
width, height, fp->mux->bih->biCompression, (char *)&fp->mux->bih->biCompression);
// {min,max}_{i,p}quantizer parsing & validation
--- MPlayer-20051225/libmpcodecs/vd_vfw.c.printf 2005-06-15 18:07:32.000000000 +0200
+++ MPlayer-20051225/libmpcodecs/vd_vfw.c 2005-12-25 14:09:37.000000000 +0100
@@ -184,7 +184,7 @@
ret = ICDecompressGetFormat(priv->handle, sh->bih, priv->o_bih);
if(ret < 0){
mp_msg(MSGT_WIN32,MSGL_ERR,"ICDecompressGetFormat failed: Error %d\n", (int)ret);
- for (i=0; i < o_bih_len; i++) mp_msg(MSGT_WIN32, MSGL_DBG2, "%02x ", priv->o_bih[i]);
+ for (i=0; i < o_bih_len; i++) mp_msg(MSGT_WIN32, MSGL_DBG2, "%02x ", priv->o_bih[i].biSize);
return 0;
}
mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressGetFormat OK\n");
@@ -275,14 +275,14 @@
#endif
if (ret)
{
- mp_msg(MSGT_WIN32, MSGL_WARN, "ICDecompressEnd failed: %d\n", ret);
+ mp_msg(MSGT_WIN32, MSGL_WARN, "ICDecompressEnd failed: %ld\n", ret);
return;
}
ret = ICClose(priv->handle);
if (ret)
{
- mp_msg(MSGT_WIN32, MSGL_WARN, "ICClose failed: %d\n", ret);
+ mp_msg(MSGT_WIN32, MSGL_WARN, "ICClose failed: %ld\n", ret);
return;
}
@@ -323,7 +323,7 @@
sh->bih, data, priv->o_bih, (flags&3) ? 0 : mpi->planes[0]);
if ((int)ret){
- mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Error decompressing frame, err=%d\n",ret);
+ mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Error decompressing frame, err=%ld\n",ret);
return NULL;
}
--- MPlayer-20051225/libmpcodecs/vd_qtvideo.c.printf 2005-11-20 01:06:16.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/vd_qtvideo.c 2005-12-25 14:09:37.000000000 +0100
@@ -152,7 +152,7 @@
result=InitializeQTML(6+16);
// result=InitializeQTML(0);
- mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"InitializeQTML returned %i\n",result);
+ mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"InitializeQTML returned %li\n",result);
// result=EnterMovies();
// printf("EnterMovies->%d\n",result);
#endif /* !MACOSX */
@@ -193,20 +193,20 @@
desc.componentFlags=0;
desc.componentFlagsMask=0;
- mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"Count = %d\n",CountComponents(&desc));
+ mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"Count = %ld\n",CountComponents(&desc));
prev=FindNextComponent(NULL,&desc);
if(!prev){
mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Cannot find requested component\n");
return(0);
}
- mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"Found it! ID = 0x%X\n",prev);
+ mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"Found it! ID = %p\n",prev);
ci=OpenComponent(prev);
mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"ci=%p\n",ci);
memset(&icap,0,sizeof(icap));
cres=ImageCodecInitialize(ci,&icap);
- mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"ImageCodecInitialize->%p size=%d (%d)\n",cres,icap.recordSize,icap.decompressRecordSize);
+ mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"ImageCodecInitialize->%#x size=%d (%d)\n",cres,icap.recordSize,icap.decompressRecordSize);
memset(&cinfo,0,sizeof(cinfo));
cres=ImageCodecGetCodecInfo(ci,&cinfo);
@@ -281,7 +281,7 @@
mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Unknown requested csp\n");
return(0);
}
- mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"imgfmt: %s qt_imgfmt: %.4s\n", vo_format_name(imgfmt), &qt_imgfmt);
+ mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"imgfmt: %s qt_imgfmt: %.4s\n", vo_format_name(imgfmt), (char *)&qt_imgfmt);
sh->context = (void *)qt_imgfmt;
if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,imgfmt)) return 0;
}
@@ -327,7 +327,7 @@
0,
mpi->planes[0],
mpi->stride[0]);
- mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"NewGWorldFromPtr returned:%d\n",65536-(result&0xffff));
+ mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"NewGWorldFromPtr returned:%ld\n",65536-(result&0xffff));
// if (65536-(result&0xFFFF) != 10000)
// return NULL;
@@ -368,7 +368,7 @@
if(decpar.wantedDestinationPixelTypes)
{ OSType *p=*(decpar.wantedDestinationPixelTypes);
if(p) while(*p){
- mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"supported csp: 0x%08X %.4s\n",*p,p);
+ mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"supported csp: 0x%08X %.4s\n",*p,(char *)p);
++p;
}
}
@@ -390,7 +390,7 @@
if(decpar.frameNumber==124){
decpar.frameNumber=1;
cres=ImageCodecPreDecompress(ci,&decpar);
- mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"ImageCodecPreDecompress cres=0x%X\n",cres);
+ mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"ImageCodecPreDecompress cres=0x%lX\n",cres);
}
#endif
--- MPlayer-20051225/libmpcodecs/vd_xanim.c.printf 2003-07-03 22:22:51.000000000 +0200
+++ MPlayer-20051225/libmpcodecs/vd_xanim.c 2005-12-25 14:09:37.000000000 +0100
@@ -258,27 +258,27 @@
return(0);
}
- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Exported functions by codec: [functable: 0x%08x entries: %d]\n",
+ mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Exported functions by codec: [functable: %p entries: %d]\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:0x%08x d:0x%08x]\n",
+ mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %d: %d %d [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, " 0x%08x: avi init/query func (id: %d)\n",
+ mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: avi init/query func (id: %d)\n",
func[i].iq_func, func[i].id);
priv->iq_func = (void *)func[i].iq_func;
}
if (func[i].what & XAVID_QT_QUERY)
{
- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " 0x%08x: qt init/query func (id: %d)\n",
+ mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: qt init/query func (id: %d)\n",
func[i].iq_func, func[i].id);
priv->iq_func = (void *)func[i].iq_func;
}
if (func[i].what & XAVID_DEC_FUNC)
{
- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " 0x%08x: decoder func (init/query: 0x%08x) (id: %d)\n",
+ mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: decoder func (init/query: %p) (id: %d)\n",
func[i].dec_func, func[i].iq_func, func[i].id);
priv->dec_func = (void *)func[i].dec_func;
}
@@ -306,7 +306,7 @@
{
case CODEC_SUPPORTED:
priv->dec_func = (void *)codec_hdr->decoder;
- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Codec is supported: found decoder for %s at 0x%08x\n",
+ mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Codec is supported: found decoder for %s at %p\n",
codec_hdr->description, codec_hdr->decoder);
return(1);
case CODEC_UNSUPPORTED:
@@ -720,8 +720,8 @@
priv->decinfo->xs = priv->decinfo->ys = 0;
priv->decinfo->special = 0;
priv->decinfo->extra = codec_hdr.extra;
- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "decinfo->extra, filled by codec: 0x%08x [%s]\n",
- &priv->decinfo->extra, priv->decinfo->extra);
+ mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "decinfo->extra, filled by codec: %p [%s]\n",
+ &priv->decinfo->extra, (char *)priv->decinfo->extra);
return(1);
}
--- MPlayer-20051225/libmpcodecs/ad_faad.c.printf 2005-11-20 01:06:16.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/ad_faad.c 2005-12-25 14:09:37.000000000 +0100
@@ -151,7 +151,7 @@
return 0;
} else {
mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Decoder init done (%dBytes)!\n", sh->a_in_buffer_len); // XXX: remove or move to debug!
- mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %dHz channels: %d\n", faac_samplerate, faac_channels);
+ mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %ldHz channels: %d\n", faac_samplerate, faac_channels);
sh->channels = faac_channels;
if (audio_output_channels <= 2) sh->channels = faac_channels > 1 ? 2 : 1;
sh->samplerate = faac_samplerate;
@@ -266,7 +266,7 @@
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Decoded zero samples!\n");
} else {
/* XXX: samples already multiplied by channels! */
- mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Successfully decoded frame (%d Bytes)!\n",
+ mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Successfully decoded frame (%ld Bytes)!\n",
sh->samplesize*faac_finfo.samples);
memcpy(buf+len,faac_sample_buffer, sh->samplesize*faac_finfo.samples);
last_dec_len = sh->samplesize*faac_finfo.samples;
--- MPlayer-20051225/libmpcodecs/ad_libvorbis.c.printf 2005-12-07 22:52:31.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/ad_libvorbis.c 2005-12-25 14:09:37.000000000 +0100
@@ -128,7 +128,7 @@
op.packet = headers[i];
op.b_o_s = (i == 0);
if(vorbis_synthesis_headerin(&ov->vi,&vc,&op) <0) {
- mp_msg(MSGT_DECAUDIO,MSGL_ERR,"OggVorbis: header n. %d broken! len=%d\n", i, op.bytes);
+ mp_msg(MSGT_DECAUDIO,MSGL_ERR,"OggVorbis: header n. %d broken! len=%ld\n", i, op.bytes);
ERROR();
}
if(i == 2) {
--- MPlayer-20051225/libmpcodecs/ve_qtvideo.c.printf 2005-11-20 01:06:16.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/ve_qtvideo.c 2005-12-25 14:09:37.000000000 +0100
@@ -146,13 +146,13 @@
cdesc.componentFlagsMask=0;
- mp_msg(MSGT_MENCODER,MSGL_DBG2,"Count = %d\n",CountComponents(&cdesc));
+ mp_msg(MSGT_MENCODER,MSGL_DBG2,"Count = %ld\n",CountComponents(&cdesc));
compressor=FindNextComponent(NULL,&cdesc);
if(!compressor){
mp_msg(MSGT_MENCODER,MSGL_ERR,"Cannot find requested component\n");
return(0);
}
- mp_msg(MSGT_MENCODER,MSGL_DBG2,"Found it! ID = 0x%X\n",compressor);
+ mp_msg(MSGT_MENCODER,MSGL_DBG2,"Found it! ID = %p\n",compressor);
// cres= FindCodec (fourcc,anyCodec,&compressor,&decompressor );
// printf("FindCodec returned:%i compressor: 0x%X decompressor: 0x%X\n",cres&0xFFFF,compressor,decompressor);
@@ -218,7 +218,7 @@
bswap_32(format),
compressor,
&framesizemax );
- mp_msg(MSGT_MENCODER,MSGL_DBG2,"GetMaxCompressionSize returned:%i : MaxSize:%i\n",cres&0xFFFF,framesizemax);
+ mp_msg(MSGT_MENCODER,MSGL_DBG2,"GetMaxCompressionSize returned:%i : MaxSize:%li\n",cres&0xFFFF,framesizemax);
frame_comp=malloc(framesizemax);
desc = (ImageDescriptionHandle)NewHandleClear(MAX_IDSIZE); //memory where the desc will be stored
--- MPlayer-20051225/libmpcodecs/ad_acm.c.printf 2005-12-07 22:52:31.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/ad_acm.c 2005-12-25 14:09:37.000000000 +0100
@@ -153,7 +153,7 @@
case ACMERR_NOTPOSSIBLE:
return;
default:
- mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occurred: %d\n", ret);
+ mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occurred: %ld\n", ret);
return;
}
@@ -189,7 +189,7 @@
acm_context_t *priv = sh_audio->context;
acmStreamSize(priv->handle, len, &srcsize, ACM_STREAMSIZEF_DESTINATION);
- mp_msg(MSGT_WIN32,MSGL_DBG3,"acm says: srcsize=%ld (buffsize=%d) out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,len);
+ mp_msg(MSGT_WIN32,MSGL_DBG3,"acm says: srcsize=%ld (buffsize=%d) out_size=%ld\n",srcsize,sh_audio->a_in_buffer_size,len);
if(srcsize<sh_audio->wf->nBlockAlign){
srcsize=sh_audio->wf->nBlockAlign;
@@ -204,7 +204,7 @@
demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
srcsize-sh_audio->a_in_buffer_len);
}
- mp_msg(MSGT_WIN32,MSGL_DBG3,"acm convert %d -> %d bytes\n",sh_audio->a_in_buffer_len,len);
+ mp_msg(MSGT_WIN32,MSGL_DBG3,"acm convert %d -> %ld bytes\n",sh_audio->a_in_buffer_len,len);
memset(&ash, 0, sizeof(ash));
ash.cbStruct=sizeof(ash);
ash.fdwStatus=0;
@@ -229,7 +229,7 @@
}
// return -1;
}
- mp_msg(MSGT_WIN32,MSGL_DBG2,"acm converted %d -> %d\n",ash.cbSrcLengthUsed,ash.cbDstLengthUsed);
+ mp_msg(MSGT_WIN32,MSGL_DBG2,"acm converted %ld -> %ld\n",ash.cbSrcLengthUsed,ash.cbDstLengthUsed);
if(ash.cbSrcLengthUsed>=sh_audio->a_in_buffer_len){
sh_audio->a_in_buffer_len=0;
} else {
--- MPlayer-20051225/libmpcodecs/vf_remove_logo.c.printf 2005-11-20 01:06:17.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/vf_remove_logo.c 2005-12-25 14:09:37.000000000 +0100
@@ -552,9 +552,9 @@
pnm_number = fgetc(input) - '0';
if (pnm_number != 5 && pnm_number != 6) REMOVE_LOGO_LOAD_PGM_ERROR_MESSAGE("[vf]remove-logo: Invalid PNM file. Only raw PGM (Portable Gray Map) and raw PPM (Portable Pixel Map) subtypes are allowed.\n");
load_pgm_skip(input);
- if (fscanf(input, "%i", &(new_pgm->width)) != 1) REMOVE_LOGO_LOAD_PGM_ERROR_MESSAGE("[vf]remove-logo: Invalid PGM/PPM header.\n");
+ if (fscanf(input, "%hu", &(new_pgm->width)) != 1) REMOVE_LOGO_LOAD_PGM_ERROR_MESSAGE("[vf]remove-logo: Invalid PGM/PPM header.\n");
load_pgm_skip(input);
- if (fscanf(input, "%i", &(new_pgm->height)) != 1) REMOVE_LOGO_LOAD_PGM_ERROR_MESSAGE("[vf]remove-logo: Invalid PGM/PPM header.\n");
+ if (fscanf(input, "%hu", &(new_pgm->height)) != 1) REMOVE_LOGO_LOAD_PGM_ERROR_MESSAGE("[vf]remove-logo: Invalid PGM/PPM header.\n");
load_pgm_skip(input);
if (fscanf(input, "%i", &maximum_greyscale_value) != 1) REMOVE_LOGO_LOAD_PGM_ERROR_MESSAGE("[vf]remove-logo: Invalid PGM/PPM header.\n");
if (maximum_greyscale_value >= 256) REMOVE_LOGO_LOAD_PGM_ERROR_MESSAGE("[vf]remove_logo: Only 1 byte per pixel (pgm) or 1 byte per color value (ppm) are supported.\n");
--- MPlayer-20051225/libmpcodecs/ae_faac.c.printf 2005-11-20 01:06:16.000000000 +0100
+++ MPlayer-20051225/libmpcodecs/ae_faac.c 2005-12-25 14:09:37.000000000 +0100
@@ -122,7 +122,7 @@
mp_msg(MSGT_MENCODER, MSGL_FATAL, "AE_FAAC, couldn't init, exit\n");
return 0;
}
- mp_msg(MSGT_MENCODER, MSGL_V, "AE_FAAC, sample_input: %u, max_bytes_output: %u\n", samples_input, max_bytes_output);
+ mp_msg(MSGT_MENCODER, MSGL_V, "AE_FAAC, sample_input: %lu, max_bytes_output: %lu\n", samples_input, max_bytes_output);
config = faacEncGetCurrentConfiguration(faac);
if(!config)
{
--- MPlayer-20051225/libmpdemux/aviprint.c.printf 2005-11-06 18:35:32.000000000 +0100
+++ MPlayer-20051225/libmpdemux/aviprint.c 2005-12-25 14:09:37.000000000 +0100
@@ -16,7 +16,7 @@
//#include "stheader.h"
void print_avih_flags(MainAVIHeader *h){
- printf("MainAVIHeader.dwFlags: (%ld)%s%s%s%s%s%s\n",h->dwFlags,
+ printf("MainAVIHeader.dwFlags: (%d)%s%s%s%s%s%s\n",h->dwFlags,
(h->dwFlags&AVIF_HASINDEX)?" HAS_INDEX":"",
(h->dwFlags&AVIF_MUSTUSEINDEX)?" MUST_USE_INDEX":"",
(h->dwFlags&AVIF_ISINTERLEAVED)?" IS_INTERLEAVED":"",
@@ -28,28 +28,28 @@
void print_avih(MainAVIHeader *h){
printf("======= AVI Header =======\n");
- printf("us/frame: %ld (fps=%5.3f)\n",h->dwMicroSecPerFrame,1000000.0f/(float)h->dwMicroSecPerFrame);
- printf("max bytes/sec: %ld\n",h->dwMaxBytesPerSec);
- printf("padding: %ld\n",h->dwPaddingGranularity);
+ printf("us/frame: %d (fps=%5.3f)\n",h->dwMicroSecPerFrame,1000000.0f/(float)h->dwMicroSecPerFrame);
+ printf("max bytes/sec: %d\n",h->dwMaxBytesPerSec);
+ printf("padding: %d\n",h->dwPaddingGranularity);
print_avih_flags(h);
- printf("frames total: %ld initial: %ld\n",h->dwTotalFrames,h->dwInitialFrames);
- printf("streams: %ld\n",h->dwStreams);
- printf("Suggested BufferSize: %ld\n",h->dwSuggestedBufferSize);
- printf("Size: %ld x %ld\n",h->dwWidth,h->dwHeight);
+ printf("frames total: %d initial: %d\n",h->dwTotalFrames,h->dwInitialFrames);
+ printf("streams: %d\n",h->dwStreams);
+ printf("Suggested BufferSize: %d\n",h->dwSuggestedBufferSize);
+ printf("Size: %d x %d\n",h->dwWidth,h->dwHeight);
printf("==========================\n");
}
void print_strh(AVIStreamHeader *h){
printf("====== STREAM Header =====\n");
printf("Type: %.4s FCC: %.4s (%X)\n",(char *)&h->fccType,(char *)&h->fccHandler,(unsigned int)h->fccHandler);
- printf("Flags: %ld\n",h->dwFlags);
+ printf("Flags: %d\n",h->dwFlags);
printf("Priority: %d Language: %d\n",h->wPriority,h->wLanguage);
- printf("InitialFrames: %ld\n",h->dwInitialFrames);
- printf("Rate: %ld/%ld = %5.3f\n",h->dwRate,h->dwScale,(float)h->dwRate/(float)h->dwScale);
- printf("Start: %ld Len: %ld\n",h->dwStart,h->dwLength);
- printf("Suggested BufferSize: %ld\n",h->dwSuggestedBufferSize);
- printf("Quality %ld\n",h->dwQuality);
- printf("Sample size: %ld\n",h->dwSampleSize);
+ printf("InitialFrames: %d\n",h->dwInitialFrames);
+ printf("Rate: %d/%d = %5.3f\n",h->dwRate,h->dwScale,(float)h->dwRate/(float)h->dwScale);
+ printf("Start: %d Len: %d\n",h->dwStart,h->dwLength);
+ printf("Suggested BufferSize: %d\n",h->dwSuggestedBufferSize);
+ printf("Quality %d\n",h->dwQuality);
+ printf("Sample size: %d\n",h->dwSampleSize);
printf("==========================\n");
}
@@ -57,15 +57,15 @@
printf("======= WAVE Format =======\n");
printf("Format Tag: %d (0x%X)\n",h->wFormatTag,h->wFormatTag);
printf("Channels: %d\n",h->nChannels);
- printf("Samplerate: %ld\n",h->nSamplesPerSec);
- printf("avg byte/sec: %ld\n",h->nAvgBytesPerSec);
+ printf("Samplerate: %d\n",h->nSamplesPerSec);
+ printf("avg byte/sec: %d\n",h->nAvgBytesPerSec);
printf("Block align: %d\n",h->nBlockAlign);
printf("bits/sample: %d\n",h->wBitsPerSample);
printf("cbSize: %d\n",h->cbSize);
if(h->wFormatTag==0x55 && h->cbSize>=12){
MPEGLAYER3WAVEFORMAT* h2=(MPEGLAYER3WAVEFORMAT *)h;
printf("mp3.wID=%d\n",h2->wID);
- printf("mp3.fdwFlags=0x%lX\n",h2->fdwFlags);
+ printf("mp3.fdwFlags=0x%X\n",h2->fdwFlags);
printf("mp3.nBlockSize=%d\n",h2->nBlockSize);
printf("mp3.nFramesPerBlock=%d\n",h2->nFramesPerBlock);
printf("mp3.nCodecDelay=%d\n",h2->nCodecDelay);
@@ -138,7 +138,7 @@
for(i=0;i<idx_size;i++){
int id=avi_stream_id(idx[i].ckid);
if(id<0 || id>255) id=255;
- printf("%5d: %.4s %4X %016llX len:%6ld pos:%7d->%7.3f %7d->%7.3f\n",i,
+ printf("%5d: %.4s %4X %016llX len:%6d pos:%7d->%7.3f %7d->%7.3f\n",i,
(char *)&idx[i].ckid,
(unsigned int)idx[i].dwFlags&0xffff,
(uint64_t)AVI_IDX_OFFSET(&idx[i]),
--- MPlayer-20051225/libmpdemux/demux_asf.c.printf 2005-12-25 14:03:32.000000000 +0100
+++ MPlayer-20051225/libmpdemux/demux_asf.c 2005-12-25 14:09:37.000000000 +0100
@@ -359,7 +359,7 @@
return 1; // success
}
- mp_msg(MSGT_DEMUX,MSGL_V,"%08X: UNKNOWN TYPE %02X %02X %02X %02X %02X...\n",demux->filepos,asf_packet[0],asf_packet[1],asf_packet[2],asf_packet[3],asf_packet[4]);
+ mp_msg(MSGT_DEMUX,MSGL_V,"%08"PRIX64": UNKNOWN TYPE %02X %02X %02X %02X %02X...\n",demux->filepos,asf_packet[0],asf_packet[1],asf_packet[2],asf_packet[3],asf_packet[4]);
return 0;
}
--- MPlayer-20051225/libmpdemux/demux_real.c.printf 2005-12-25 14:03:32.000000000 +0100
+++ MPlayer-20051225/libmpdemux/demux_real.c 2005-12-25 14:09:37.000000000 +0100
@@ -1785,7 +1785,7 @@
if(demuxer->video->sh){
sh_video_t *sh=demuxer->video->sh;
mp_msg(MSGT_DEMUX,MSGL_V,"VIDEO: %.4s [%08X,%08X] %dx%d (aspect %4.2f) %4.2f fps\n",
- &sh->format,((unsigned int*)(sh->bih+1))[1],((unsigned int*)(sh->bih+1))[0],
+ (char *)&sh->format,((unsigned int*)(sh->bih+1))[1],((unsigned int*)(sh->bih+1))[0],
sh->disp_w,sh->disp_h,sh->aspect,sh->fps);
}
--- MPlayer-20051225/libmpdemux/muxer_mpeg.c.printf 2005-12-07 22:52:33.000000000 +0100
+++ MPlayer-20051225/libmpdemux/muxer_mpeg.c 2005-12-25 14:09:37.000000000 +0100
@@ -1874,7 +1874,7 @@
case 60060:
return 1536000;
default:
- mp_msg(MSGT_MUXER, MSGL_ERR, "ERROR! unknown fps code: %d", fps);
+ mp_msg(MSGT_MUXER, MSGL_ERR, "ERROR! unknown fps code: %5.2f", fps);
return 0;
}
}
--- MPlayer-20051225/libmpdemux/demux_ty.c.printf 2005-12-13 22:12:01.000000000 +0100
+++ MPlayer-20051225/libmpdemux/demux_ty.c 2005-12-25 14:09:37.000000000 +0100
@@ -188,7 +188,7 @@
}
if ( ok == 0 )
{
- mp_msg( MSGT_DEMUX, MSGL_DBG3, "Seek bad %d\n", offset );
+ mp_msg( MSGT_DEMUX, MSGL_DBG3, "Seek bad %"PRId64"\n", offset );
done = 1;
error = 1;
break;
@@ -284,7 +284,7 @@
mp_msg( MSGT_DEMUX, MSGL_DBG3,
"tmf_filetoparts():total size %"PRId64"\n", tivo->tmf_totalsize );
mp_msg( MSGT_DEMUX, MSGL_DBG3,
- "tmf_filetoparts():total chunks %d\n", tivo->tmf_totalchunks );
+ "tmf_filetoparts():total chunks %"PRId64"\n", tivo->tmf_totalchunks );
return( 1 );
}
@@ -697,7 +697,7 @@
numberParts = demux->stream->end_pos / TIVO_PART_LENGTH;
offset = numberParts * TIVO_PART_LENGTH;
- mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:ty/ty+Number Parts %d\n",
+ mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:ty/ty+Number Parts %"PRId64"\n",
numberParts );
if ( ( offset + CHUNKSIZE ) < demux->stream->end_pos )
@@ -755,7 +755,7 @@
mp_msg( MSGT_DEMUX, MSGL_DBG3,
"ty:ty header size %"PRIx64"\n", tivo->size );
mp_msg( MSGT_DEMUX, MSGL_DBG3,
- "ty:ty which Chunk %"PRIx64"\n", tivo->whichChunk );
+ "ty:ty which Chunk %d\n", tivo->whichChunk );
mp_msg( MSGT_DEMUX, MSGL_DBG3,
"ty:file end_pos %"PRIx64"\n", demux->stream->end_pos );
mp_msg( MSGT_DEMUX, MSGL_DBG3,
--- MPlayer-20051225/libmpdemux/demux_avi.c.printf 2005-11-06 18:35:33.000000000 +0100
+++ MPlayer-20051225/libmpdemux/demux_avi.c 2005-12-25 14:09:37.000000000 +0100
@@ -221,7 +221,7 @@
pos = (off_t)priv->idx_offset+AVI_IDX_OFFSET(idx);
if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & STREAM_SEEK)){
- mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%X \n",pos);
+ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%"PRIX64" \n",pos);
continue;
}
#if 0
@@ -245,7 +245,7 @@
// if((len&(~1))!=(idx->dwChunkLength&(~1))){
// if((len)!=(idx->dwChunkLength)){
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
- mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
+ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%d \n",len,idx->dwChunkLength);
if(len>0x200000 && idx->dwChunkLength>0x200000) continue; // both values bad :(
len=choose_chunk_len(idx->dwChunkLength,len);
}
@@ -335,7 +335,7 @@
pos = priv->idx_offset+AVI_IDX_OFFSET(idx);
if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start)){
- mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! current=0x%X idx=0x%X \n",demux->filepos,pos);
+ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! current=0x%"PRIX64" idx=0x%"PRIX64" \n",demux->filepos,pos);
continue;
}
#if 0
@@ -358,7 +358,7 @@
}
len=stream_read_dword_le(demux->stream);
if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
- mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
+ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%d \n",len,idx->dwChunkLength);
if(len>0x200000 && idx->dwChunkLength>0x200000) continue; // both values bad :(
len=choose_chunk_len(idx->dwChunkLength,len);
}
@@ -582,7 +582,7 @@
asamples+=(len+priv->audio_block_size-1)/priv->audio_block_size;
}
}
- mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%lu (%lu) audio size=%lu (%lu)\n",vsize,vsamples,asize,asamples);
+ mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%u (%u) audio size=%u (%u)\n",vsize,vsamples,asize,asamples);
priv->numberofframes=vsamples;
sh_video->i_bps=((float)vsize/(float)vsamples)*(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
if(sh_audio) sh_audio->i_bps=((float)asize/(float)asamples)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
@@ -609,7 +609,7 @@
}
}
vsize=demuxer->movi_end-demuxer->movi_start-asize-8*priv->numberofframes;
- mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%lu (%lu) audio size=%lu\n",vsize,priv->numberofframes,asize);
+ mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%d (%u) audio size=%d\n",vsize,priv->numberofframes,asize);
sh_video->i_bps=(float)vsize/(sh_video->frametime*priv->numberofframes);
}
return demuxer;
--- MPlayer-20051225/libmpdemux/demux_film.c.printf 2005-12-25 14:09:37.000000000 +0100
+++ MPlayer-20051225/libmpdemux/demux_film.c 2005-12-25 14:09:37.000000000 +0100
@@ -249,7 +249,7 @@
header_size -= 16;
mp_msg(MSGT_DEMUX, MSGL_HINT, "FILM version %.4s\n",
- &film_data->film_version);
+ (char *)&film_data->film_version);
// skip to where the next chunk should be
stream_skip(demuxer->stream, 4);
--- MPlayer-20051225/libmpdemux/cache2.c.printf 2005-11-20 01:06:17.000000000 +0100
+++ MPlayer-20051225/libmpdemux/cache2.c 2005-12-25 14:09:37.000000000 +0100
@@ -120,7 +120,7 @@
if(read<s->min_filepos || read>s->max_filepos){
// seek...
- mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%X \n",read);
+ mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%"PRIX64" \n",read);
// streaming: drop cache contents only if seeking backward or too much fwd:
if(s->stream->type!=STREAMTYPE_STREAM ||
read<s->min_filepos || read>=s->max_filepos+s->seek_limit)
@@ -288,7 +288,7 @@
stream->cache_pid = CreateThread(NULL,0,ThreadProc,s,0,&threadId);
#endif
// wait until cache is filled at least prefill_init %
- mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d pre:%d eof:%d \n",
+ mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n",
s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof);
while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){
mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill,
@@ -347,7 +347,7 @@
s=stream->cache_data;
// s->seek_lock=1;
- mp_msg(MSGT_CACHE,MSGL_DBG2,"CACHE2_SEEK: 0x%X <= 0x%X (0x%X) <= 0x%X \n",s->min_filepos,(int)pos,s->read_filepos,s->max_filepos);
+ mp_msg(MSGT_CACHE,MSGL_DBG2,"CACHE2_SEEK: 0x%"PRIX64" <= 0x%"PRIX64" (0x%"PRIX64") <= 0x%"PRIX64" \n",s->min_filepos,pos,s->read_filepos,s->max_filepos);
newpos=pos/s->sector_size; newpos*=s->sector_size; // align
stream->pos=s->read_filepos=newpos;
--- MPlayer-20051225/libmpdemux/aviheader.c.printf 2005-11-06 18:35:32.000000000 +0100
+++ MPlayer-20051225/libmpdemux/aviheader.c 2005-12-25 14:09:37.000000000 +0100
@@ -238,7 +238,7 @@
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%016llx 0x%04x %u\n",
(s->dwChunkId), i,
(uint64_t)s->aIndex[i].qwOffset, s->aIndex[i].dwSize, s->aIndex[i].dwDuration);
}
@@ -412,7 +412,7 @@
}
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));
+ chunksize, chunksize+(int)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){
--- MPlayer-20051225/libmpdemux/demux_mpg.c.printf 2005-11-06 18:35:33.000000000 +0100
+++ MPlayer-20051225/libmpdemux/demux_mpg.c 2005-12-25 14:09:37.000000000 +0100
@@ -611,7 +611,7 @@
if(demux->synced==1){
if(head==0x1BB || head==0x1BD || (head>=0x1C0 && head<=0x1EF)){
demux->synced=2;
- mp_msg(MSGT_DEMUX,MSGL_V,"system stream synced at 0x%X (%d)!\n",demux->filepos,demux->filepos);
+ mp_msg(MSGT_DEMUX,MSGL_V,"system stream synced at 0x%"PRIX64" (%"PRId64")!\n",demux->filepos,demux->filepos);
num_elementary_packets100=0; // requires for re-sync!
num_elementary_packets101=0; // requires for re-sync!
} else demux->synced=0;
--- MPlayer-20051225/libmpdemux/muxer_avi.c.printf 2005-12-07 22:52:33.000000000 +0100
+++ MPlayer-20051225/libmpdemux/muxer_avi.c 2005-12-25 14:09:37.000000000 +0100
@@ -531,7 +531,7 @@
} else {
if (ftello(f) != 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 %d, missing space %d\n", MOVIALIGN, ftell(muxer->file), ftell(muxer->file)-MOVIALIGN);
+ mp_msg(MSGT_MUXER, MSGL_ERR, "Expected filepos %d, real filepos %ld, missing space %ld\n", MOVIALIGN, ftell(muxer->file), ftell(muxer->file)-MOVIALIGN);
mp_msg(MSGT_MUXER, MSGL_ERR, "Try increasing MOVIALIGN in libmpdemux/muxer_avi.c\n");
}
write_avi_list(f,listtypeAVIMOVIE,muxer->movi_end-ftello(f)-12);
--- MPlayer-20051225/libmpdemux/tvi_v4l.c.printf 2005-11-20 01:06:18.000000000 +0100
+++ MPlayer-20051225/libmpdemux/tvi_v4l.c 2005-12-25 14:09:37.000000000 +0100
@@ -437,7 +437,7 @@
priv->audio_skew_buffer = NULL;
priv->video_fd = open(priv->video_device, O_RDWR);
- mp_msg(MSGT_TV, MSGL_DBG2, "Video fd: %d, %x\n", priv->video_fd,
+ mp_msg(MSGT_TV, MSGL_DBG2, "Video fd: %d, %p\n", priv->video_fd,
priv->video_device);
if (priv->video_fd == -1)
{
--- MPlayer-20051225/libmpdemux/demux_lmlm4.c.printf 2005-08-06 02:41:22.000000000 +0200
+++ MPlayer-20051225/libmpdemux/demux_lmlm4.c 2005-12-25 14:09:37.000000000 +0100
@@ -216,7 +216,7 @@
hdr:
demux->filepos = stream_tell(demux->stream);
- mp_msg(MSGT_DEMUX, MSGL_DBG2, "fpos = %d\n", demux->filepos);
+ mp_msg(MSGT_DEMUX, MSGL_DBG2, "fpos = %"PRId64"\n", demux->filepos);
ret=getFrame(demux, &frameInfo);
if(ret<=0) return ret; // EOF/error
--- MPlayer-20051225/libmpdemux/demux_mov.c.printf 2005-11-20 01:06:18.000000000 +0100
+++ MPlayer-20051225/libmpdemux/demux_mov.c 2005-12-25 14:09:37.000000000 +0100
@@ -388,7 +388,7 @@
break;
default:
tmp = be2me_32(tmp);
- mp_msg(MSGT_DEMUX,MSGL_WARN,"ISO: Unknown File Type Major Brand: %.4s\n",&tmp);
+ mp_msg(MSGT_DEMUX,MSGL_WARN,"ISO: Unknown File Type Major Brand: %.4s\n",(char *)&tmp);
}
mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Minor Version: %d\n",
stream_read_dword(demuxer->stream));
@@ -396,7 +396,7 @@
// List all compatible brands
for(i = 0; i < ((len-16)/4); i++) {
tmp = be2me_32(stream_read_dword(demuxer->stream));
- mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Compatible Brand #%d: %.4s\n",i,&tmp);
+ mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Compatible Brand #%d: %.4s\n",i,(char *)&tmp);
skipped += 4;
}
#endif
@@ -406,7 +406,7 @@
mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Movie header found!\n");
priv->moov_start=(off_t)stream_tell(demuxer->stream);
priv->moov_end=(off_t)priv->moov_start+len-skipped;
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie header: start: %x end: %x\n",
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie header: start: %"PRIx64" end: %"PRIx64"\n",
priv->moov_start, priv->moov_end);
skipped+=8;
i = stream_read_dword(demuxer->stream)-8;
@@ -470,7 +470,7 @@
mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Movie DATA found!\n");
priv->mdat_start=stream_tell(demuxer->stream);
priv->mdat_end=priv->mdat_start+len-skipped;
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie data: start: %x end: %x\n",
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie data: start: %"PRIx64" end: %"PRIx64"\n",
priv->mdat_start, priv->mdat_end);
flags|=2;
if(flags==3){
@@ -482,7 +482,7 @@
case MOV_FOURCC('f','r','e','e'):
case MOV_FOURCC('s','k','i','p'):
case MOV_FOURCC('j','u','n','k'):
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: free space (len: %d)\n", len);
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: free space (len: %"PRId64")\n", len);
/* unused, if you edit a mov, you can use space provided by free atoms (redefining it) */
break;
case MOV_FOURCC('p','n','o','t'):
@@ -492,7 +492,7 @@
default:
if(no==0){ free(priv); return 0;} // first chunk is bad!
id = be2me_32(id);
- mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",&id,(int)len);
+ mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",(char *)&id,(int)len);
}
skip_chunk:
if(!stream_skip(demuxer->stream,len-skipped)) break;
@@ -560,7 +560,7 @@
len-=8;
id=stream_read_dword(demuxer->stream);
//
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"lschunks %.4s %d\n",&id,(int)len);
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"lschunks %.4s %d\n",(char *)&id,(int)len);
//
if(trak){
if (lschunks_intrak(demuxer, level, id, pos, len, trak) < 0)
@@ -778,7 +778,7 @@
atom_len);
}
}
- mp_msg(MSGT_DEMUX, MSGL_INFO, "Fourcc: %.4s\n",&trak->fourcc);
+ mp_msg(MSGT_DEMUX, MSGL_INFO, "Fourcc: %.4s\n",(char *)&trak->fourcc);
#if 0
{ FILE* f=fopen("stdata.dat","wb");
fwrite(trak->stdata,trak->stdata_len,1,f);
@@ -1122,7 +1122,7 @@
mp_msg(MSGT_DEMUX, MSGL_INFO, "Display size: %d x %d\n",
trak->tkdata[77]|(trak->tkdata[76]<<8),
trak->tkdata[81]|(trak->tkdata[80]<<8));
- mp_msg(MSGT_DEMUX, MSGL_INFO, "Fourcc: %.4s Codec: '%.*s'\n",&trak->fourcc,trak->stdata[42]&31,trak->stdata+43);
+ mp_msg(MSGT_DEMUX, MSGL_INFO, "Fourcc: %.4s Codec: '%.*s'\n",(char *)&trak->fourcc,trak->stdata[42]&31,trak->stdata+43);
// if(demuxer->video->id==-1 || demuxer->video->id==priv->track_db){
// // (auto)selected video track:
@@ -1203,7 +1203,7 @@
case MOV_FOURCC('d','c','o','m'): {
// int temp=stream_read_dword(demuxer->stream);
unsigned int algo=be2me_32(stream_read_dword(demuxer->stream));
- mp_msg(MSGT_DEMUX, MSGL_INFO, "Compressed header uses %.4s algo!\n",&algo);
+ mp_msg(MSGT_DEMUX, MSGL_INFO, "Compressed header uses %.4s algo!\n",(char *)&algo);
break;
}
case MOV_FOURCC('c','m','v','d'): {
@@ -1247,7 +1247,7 @@
}
#endif
if(moov_sz != zstrm.total_out)
- mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! moov size differs cmov: %d zlib: %d\n",moov_sz,zstrm.total_out);
+ mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! moov size differs cmov: %d zlib: %ld\n",moov_sz,zstrm.total_out);
zret = inflateEnd(&zstrm);
backup=demuxer->stream;
@@ -1275,7 +1275,7 @@
udta_len = stream_read_dword(demuxer->stream);
udta_id = stream_read_dword(demuxer->stream);
udta_size -= 8;
- mp_msg(MSGT_DEMUX, MSGL_DBG2, "udta_id: %.4s (len: %d)\n", &udta_id, udta_len);
+ mp_msg(MSGT_DEMUX, MSGL_DBG2, "udta_id: %.4s (len: %"PRId64")\n", (char *)&udta_id, udta_len);
switch (udta_id)
{
case MOV_FOURCC(0xa9,'c','p','y'):
@@ -1378,7 +1378,7 @@
} /* eof udta */
default:
id = be2me_32(id);
- mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",&id,(int)len);
+ mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",(char *)&id,(int)len);
} /* endof switch */
} /* endof else */
@@ -1454,7 +1454,7 @@
str[len] = 0;
mp_msg(MSGT_DEMUX, MSGL_V,
"MOV: %*sHandler header: %.4s/%.4s (%.4s) %s\n", level, "",
- &type, &subtype, &manufact, str);
+ (char *)&type, (char *)&subtype, (char *)&manufact, str);
free(str);
switch(bswap_32(type)) {
case MOV_FOURCC('m','h','l','r'):
@@ -1466,7 +1466,7 @@
default:
mp_msg(MSGT_DEMUX, MSGL_V,
"MOV: unknown handler class: 0x%X (%.4s)\n",
- bswap_32(type), &type);
+ bswap_32(type), (char *)&type);
}
break;
}
@@ -1508,8 +1508,8 @@
if (len < 8)
break; // error
mp_msg(MSGT_DEMUX, MSGL_V,
- "MOV: %*s desc #%d: %.4s (%d bytes)\n", level, "",
- i, &fourcc, len - 16);
+ "MOV: %*s desc #%d: %.4s (%"PRId64" bytes)\n", level, "",
+ i, (char *)&fourcc, len - 16);
if (fourcc != trak->fourcc && i)
mp_msg(MSGT_DEMUX, MSGL_WARN, MSGTR_MOVvariableFourCC);
// if(!i)
@@ -1554,7 +1554,7 @@
int flags = (temp << 16) | (temp << 8) | temp;
int i;
mp_msg(MSGT_DEMUX, MSGL_V,
- "MOV: %*sSample->Chunk mapping table! (%d blocks) (ver:%d,flags:%ld)\n", level, "",
+ "MOV: %*sSample->Chunk mapping table! (%d blocks) (ver:%d,flags:%d)\n", level, "",
len, ver, flags);
// read data:
trak->chunkmap_size = len;
@@ -1574,7 +1574,7 @@
int entries = stream_read_dword(demuxer->stream);
int i;
mp_msg(MSGT_DEMUX, MSGL_V,
- "MOV: %*sSample size table! (entries=%d ss=%d) (ver:%d,flags:%ld)\n", level, "",
+ "MOV: %*sSample size table! (entries=%d ss=%d) (ver:%d,flags:%d)\n", level, "",
entries, ss, ver, flags);
trak->samplesize = ss;
if (!ss) {
@@ -1634,7 +1634,7 @@
int flags = (temp << 16) | (temp<<8) | temp;
int i;
mp_msg(MSGT_DEMUX, MSGL_V,
- "MOV: %*sSyncing samples (keyframes) table! (%d entries) (ver:%d,flags:%ld)\n", level, "",
+ "MOV: %*sSyncing samples (keyframes) table! (%d entries) (ver:%d,flags:%d)\n", level, "",
entries, ver, flags);
trak->keyframes_size = entries;
trak->keyframes = malloc(sizeof(unsigned int) * entries);
@@ -1669,7 +1669,7 @@
int flags = (temp << 16) | (temp << 8) | temp;
int i;
mp_msg(MSGT_DEMUX, MSGL_V,
- "MOV: %*sEdit list table (%d entries) (ver:%d,flags:%ld)\n", level, "",
+ "MOV: %*sEdit list table (%d entries) (ver:%d,flags:%d)\n", level, "",
entries, ver, flags);
#if 1
trak->editlist_size = entries;
@@ -1694,7 +1694,7 @@
}
default:
id = be2me_32(id);
- mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",&id,(int)len);
+ mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",(char *)&id,(int)len);
break;
}//switch(id)
return 0;
@@ -1712,7 +1712,7 @@
stream_reset(demuxer->stream);
if(!stream_seek(demuxer->stream,priv->moov_start))
{
- mp_msg(MSGT_DEMUX,MSGL_ERR,"MOV: Cannot seek to the beginning of the Movie header (0x%x)\n",
+ mp_msg(MSGT_DEMUX,MSGL_ERR,"MOV: Cannot seek to the beginning of the Movie header (0x%"PRIx64")\n",
priv->moov_start);
return 0;
}
@@ -1804,7 +1804,7 @@
zret = inflateInit(&zstrm);
zret = inflate(&zstrm, Z_NO_FLUSH);
if(newlen != zstrm.total_out)
- mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! unzipped frame size differs hdr: %d zlib: %d\n",newlen,zstrm.total_out);
+ mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! unzipped frame size differs hdr: %d zlib: %ld\n",newlen,zstrm.total_out);
write(fd, buf2, newlen);
} else {
--- MPlayer-20051225/libmpdemux/demux_viv.c.printf 2005-12-25 14:03:32.000000000 +0100
+++ MPlayer-20051225/libmpdemux/demux_viv.c 2005-12-25 14:09:37.000000000 +0100
@@ -111,7 +111,7 @@
header_len -= strlen(token)+2;
if (sscanf(token, "%[^:]:%[^\n]", opt, param) != 2)
{
- mp_msg(MSGT_DEMUX, MSGL_V, "viv_text_header_parser: bad line: '%s' at ~%p\n",
+ mp_msg(MSGT_DEMUX, MSGL_V, "viv_text_header_parser: bad line: '%s' at ~%#"PRIx64"\n",
token, stream_tell(demux->stream));
break;
}
@@ -362,7 +362,7 @@
audio_pos+=len;
break;
default:
- mp_msg(MSGT_DEMUX,MSGL_WARN,"VIVO - unknown ID found: %02X at pos %lu contact author!\n",
+ mp_msg(MSGT_DEMUX,MSGL_WARN,"VIVO - unknown ID found: %02X at pos %"PRIu64" contact author!\n",
c, stream_tell(demux->stream));
return 0;
}
@@ -623,7 +623,7 @@
/* disable seeking */
demuxer->seekable = 0;
- printf("VIVO Video stream %d size: display: %dx%d, codec: %ux%u\n",
+ mp_msg(MSGT_DEMUX,MSGL_STATUS,"VIVO Video stream %d size: display: %dx%d, codec: %ux%u\n",
demuxer->video->id, sh->disp_w, sh->disp_h, sh->bih->biWidth,
sh->bih->biHeight);
}
--- MPlayer-20051225/libmpdemux/demux_pva.c.printf 2005-12-13 22:12:01.000000000 +0100
+++ MPlayer-20051225/libmpdemux/demux_pva.c 2005-12-25 14:09:37.000000000 +0100
@@ -326,7 +326,7 @@
{
if(stream_read_word(d->stream) != (('A'<<8)|'V'))
{
- mp_msg(MSGT_DEMUX,MSGL_V,"demux_pva: pva_get_payload() missed a SyncWord at %ld!! Trying to sync...\n",stream_tell(d->stream));
+ mp_msg(MSGT_DEMUX,MSGL_V,"demux_pva: pva_get_payload() missed a SyncWord at %"PRId64"!! Trying to sync...\n",stream_tell(d->stream));
if(!pva_sync(d))
{
if (!d->stream->eof)
@@ -350,7 +350,7 @@
flags=stream_read_char(d->stream);
payload->is_packet_start=flags & 0x10;
pack_size=le2me_16(stream_read_word(d->stream));
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_pva::pva_get_payload(): pack_size=%u field read at offset %lu\n",pack_size,stream_tell(d->stream)-2);
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_pva::pva_get_payload(): pack_size=%u field read at offset %"PRIu64"\n",pack_size,stream_tell(d->stream)-2);
pva_payload_start=stream_tell(d->stream);
next_offset=pva_payload_start+pack_size;
--- MPlayer-20051225/libmpdemux/demuxer.c.printf 2005-12-25 14:03:32.000000000 +0100
+++ MPlayer-20051225/libmpdemux/demuxer.c 2005-12-25 14:09:37.000000000 +0100
@@ -715,7 +715,7 @@
if ((sh_video=demuxer->video->sh) && sh_video->bih){
int biComp=le2me_32(sh_video->bih->biCompression);
- mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n",
+ mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %dx%d %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n",
(char *)&biComp,
sh_video->bih->biWidth,
sh_video->bih->biHeight,
--- MPlayer-20051225/libmpdemux/demux_rawdv.c.printf 2005-09-04 22:36:28.000000000 +0200
+++ MPlayer-20051225/libmpdemux/demux_rawdv.c 2005-12-25 14:09:37.000000000 +0100
@@ -135,7 +135,7 @@
rawdv_frames_t *frames = (rawdv_frames_t *)malloc(sizeof(rawdv_frames_t));
dv_decoder_t *dv_decoder=NULL;
- mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() end_pos %d\n",demuxer->stream->end_pos);
+ mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() end_pos %"PRId64"\n",demuxer->stream->end_pos);
// go back to the beginning
stream_reset(demuxer->stream);
--- MPlayer-20051225/libmpdvdkit2/ifo_print.c.printf 2005-11-06 18:35:34.000000000 +0100
+++ MPlayer-20051225/libmpdvdkit2/ifo_print.c 2005-12-25 14:09:37.000000000 +0100
@@ -763,14 +763,14 @@
for(i = 0; i < 8; i++) {
if(pgc->audio_control[i].present) {
printf("Audio stream %i control: %04x\n",
- i, pgc->audio_control[i]);
+ i, pgc->audio_control[i].present);
}
}
for(i = 0; i < 32; i++) {
if(pgc->subp_control[i].present) {
printf("Subpicture stream %2i control: %08x\n",
- i, pgc->subp_control[i]);
+ i, pgc->subp_control[i].present);
}
}
--- MPlayer-20051225/libvo/font_load_ft.c.printf 2005-06-15 18:07:34.000000000 +0200
+++ MPlayer-20051225/libvo/font_load_ft.c 2005-12-25 14:09:37.000000000 +0100
@@ -179,8 +179,8 @@
else {
glyph_index = FT_Get_Char_Index(face, uni_charmap ? character:code);
if (glyph_index==0) {
- WARNING("Glyph for char 0x%02x|U+%04X|%c not found.", code, character,
- code<' '||code>255 ? '.':code);
+ WARNING("Glyph for char 0x%02lx|U+%04lX|%c not found.", code, character,
+ code<' '||code>255 ? '.':(char)code);
desc->font[unicode?character:code] = -1;
continue;
}
--- MPlayer-20051225/libvo/x11_common.c.printf 2005-12-07 22:52:33.000000000 +0100
+++ MPlayer-20051225/libvo/x11_common.c 2005-12-25 14:09:37.000000000 +0100
@@ -205,7 +205,7 @@
mp_msg(MSGT_VO, MSGL_ERR, "X11 error: %s\n", msg);
mp_msg(MSGT_VO, MSGL_V,
- "Type: %x, display: %x, resourceid: %x, serial: %x\n",
+ "Type: %x, display: %p, resourceid: %lx, serial: %lx\n",
event->type, event->display, event->resourceid, event->serial);
mp_msg(MSGT_VO, MSGL_V,
"Error code: %x, request code: %x, minor code: %x\n",
@@ -1299,7 +1299,7 @@
xev.data.l[0] = layer ? fs_layer : orig_layer; // if not fullscreen, stay on default layer
xev.data.l[1] = CurrentTime;
mp_msg(MSGT_VO, MSGL_V,
- "[x11] Layered style stay on top (layer %d).\n",
+ "[x11] Layered style stay on top (layer %ld).\n",
xev.data.l[0]);
XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask,
(XEvent *) & xev);
@@ -1604,7 +1604,7 @@
return;
}
mp_msg(MSGT_VO, MSGL_INFO,
- "xscreensaver_disable: xscreensaver wid=%d.\n", xs_windowid);
+ "xscreensaver_disable: xscreensaver wid=%ld.\n", xs_windowid);
deactivate = XInternAtom(dpy, "DEACTIVATE", False);
screensaver = XInternAtom(dpy, "SCREENSAVER", False);
@@ -1903,7 +1903,7 @@
for (i = 0; i < nvisuals; i++)
{
mp_msg(MSGT_VO, MSGL_V,
- "vo: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n",
+ "vo: X11 truecolor visual %#lx, depth %d, R:%lX G:%lX B:%lX\n",
visuals[i].visualid, visuals[i].depth,
visuals[i].red_mask, visuals[i].green_mask,
visuals[i].blue_mask);
@@ -2347,27 +2347,27 @@
switch ( xv_ck_info.source )
{
case CK_SRC_CUR:
- mp_msg( MSGT_VO, MSGL_V, "Using colorkey from Xv (0x%06x).\n",
+ mp_msg( MSGT_VO, MSGL_V, "Using colorkey from Xv (0x%06lx).\n",
xv_colorkey );
break;
case CK_SRC_USE:
if ( xv_ck_info.method == CK_METHOD_AUTOPAINT )
{
mp_msg( MSGT_VO, MSGL_V,
- "Ignoring colorkey from MPlayer (0x%06x).\n",
+ "Ignoring colorkey from MPlayer (0x%06lx).\n",
xv_colorkey );
}
else
{
mp_msg( MSGT_VO, MSGL_V,
- "Using colorkey from MPlayer (0x%06x)."
+ "Using colorkey from MPlayer (0x%06lx)."
" Use -colorkey to change.\n",
xv_colorkey );
}
break;
case CK_SRC_SET:
mp_msg( MSGT_VO, MSGL_V,
- "Setting and using colorkey from MPlayer (0x%06x)."
+ "Setting and using colorkey from MPlayer (0x%06lx)."
" Use -colorkey to change.\n",
xv_colorkey );
break;
--- MPlayer-20051225/libvo/vo_dga.c.printf 2005-09-04 22:36:29.000000000 +0200
+++ MPlayer-20051225/libvo/vo_dga.c 2005-12-25 14:09:37.000000000 +0100
@@ -811,7 +811,7 @@
// do some more checkings here ...
mp_msg(MSGT_VO, MSGL_V,
- "vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %08x, bpp: %d\n",
+ "vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %p, bpp: %d\n",
vo_dga_width, vo_dga_vp_width, vo_dga_vp_height,
HW_MODE.vdm_bytespp, vo_dga_base, HW_MODE.vdm_bitspp);
@@ -900,7 +900,7 @@
for (i = 0; i < vo_modecount; i++)
{
mp_msg(MSGT_VO, MSGL_V,
- "vo_dga: (%03d) depth=%d, bpp=%d, r=%08x, g=%08x, b=%08x, %d x %d\n",
+ "vo_dga: (%03d) depth=%d, bpp=%d, r=%08lx, g=%08lx, b=%08lx, %d x %d\n",
i, vo_modelines[i].depth,
vo_modelines[i].bitsPerPixel,
vo_modelines[i].redMask, vo_modelines[i].greenMask,
--- MPlayer-20051225/libvo/vo_gif89a.c.printf 2005-11-06 18:35:34.000000000 +0100
+++ MPlayer-20051225/libvo/vo_gif89a.c 2005-12-25 14:09:37.000000000 +0100
@@ -165,7 +165,7 @@
char LB2[] = { 1, 0, 0 };
#endif
- mp_msg(MSGT_VO, MSGL_DBG2, "GIF89a: Config entered [%ldx%ld]\n", s_width,s_height);
+ mp_msg(MSGT_VO, MSGL_DBG2, "GIF89a: Config entered [%dx%d]\n", s_width,s_height);
mp_msg(MSGT_VO, MSGL_DBG2, "GIF89a: With requested format: %s\n", vo_format_name(format));
// save these for later.
--- MPlayer-20051225/libvo/vo_dxr3.c.printf 2005-11-09 01:05:36.000000000 +0100
+++ MPlayer-20051225/libvo/vo_dxr3.c 2005-12-25 14:09:37.000000000 +0100
@@ -657,7 +657,7 @@
acq_color = ((key_color.red / 256) << 16) | ((key_color.green / 256) << 8) | key_color.blue;
if (key_color.pixel != KEY_COLOR) {
- printf("VO: [dxr3] Unable to allocate exact keycolor, using closest match (%0x).\n", key_color.pixel);
+ printf("VO: [dxr3] Unable to allocate exact keycolor, using closest match (0x%lx).\n", key_color.pixel);
}
/* Set keycolor and activate overlay */
--- MPlayer-20051225/vidix/drivers/savage_vid.c.printf 2005-03-02 00:00:05.000000000 +0100
+++ MPlayer-20051225/vidix/drivers/savage_vid.c 2005-12-25 14:09:37.000000000 +0100
@@ -1305,7 +1305,7 @@
vinfo->frame_size = info->pitch * info->src_h;
- printf("$#### destination pitch = %lu\n", info->pitch&0xffff);
+ printf("$#### destination pitch = %u\n", info->pitch&0xffff);
@@ -1469,7 +1469,7 @@
break;
}
- fprintf(stderr,":\t\t 0x%08X = %lu\n",val,val);
+ fprintf(stderr,":\t\t 0x%08X = %u\n",val,val);
}
--- MPlayer-20051225/mplayer.c.printf 2005-12-07 22:52:28.000000000 +0100
+++ MPlayer-20051225/mplayer.c 2005-12-25 14:09:37.000000000 +0100
@@ -1028,13 +1028,13 @@
if (!f) return;
fprintf(f, "----------------------------------------------------------\n");
if (subdata->sub_uses_time) {
- fprintf(f, "N: %s S: %02d:%02d:%02d.%02d E: %02d:%02d:%02d.%02d\n", filename,
+ fprintf(f, "N: %s S: %02ld:%02ld:%02ld.%02ld E: %02ld:%02ld:%02ld.%02ld\n", filename,
vo_sub_last->start/360000, (vo_sub_last->start/6000)%60,
(vo_sub_last->start/100)%60, vo_sub_last->start%100,
vo_sub_last->end/360000, (vo_sub_last->end/6000)%60,
(vo_sub_last->end/100)%60, vo_sub_last->end%100);
} else {
- fprintf(f, "N: %s S: %d E: %d\n", filename, vo_sub_last->start, vo_sub_last->end);
+ fprintf(f, "N: %s S: %ld E: %ld\n", filename, vo_sub_last->start, vo_sub_last->end);
}
for (i = 0; i < vo_sub_last->lines; i++) {
fprintf(f, "%s\n", vo_sub_last->text[i]);
@@ -2311,7 +2311,7 @@
if (sh_video) {
/* Assume FOURCC if all bytes >= 0x20 (' ') */
if (sh_video->format >= 0x20202020)
- mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", &sh_video->format);
+ mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", (char *)&sh_video->format);
else
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=0x%08X\n", sh_video->format);
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_BITRATE=%d\n", sh_video->i_bps*8);
@@ -2325,7 +2325,7 @@
mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_CODEC=%s\n", sh_audio->codec->name);
/* Assume FOURCC if all bytes >= 0x20 (' ') */
if (sh_audio->format >= 0x20202020)
- mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", &sh_audio->format);
+ mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", (char *)&sh_audio->format);
else
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_FORMAT=%d\n", sh_audio->format);
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_BITRATE=%d\n", sh_audio->i_bps*8);
@@ -3758,7 +3758,7 @@
{
#ifdef USE_SUB
if (sh_video) {
- mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_SUB_VISIBILITY=%ld\n", sub_visibility);
+ mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_SUB_VISIBILITY=%d\n", sub_visibility);
}
#endif
} break;
@@ -3884,11 +3884,11 @@
case MP_CMD_GET_VO_FULLSCREEN : {
if(video_out && vo_config_count)
- mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_VO_FULLSCREEN=%ld\n", vo_fs);
+ mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_VO_FULLSCREEN=%d\n", vo_fs);
} break;
case MP_CMD_GET_PERCENT_POS : {
- mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_PERCENT_POSITION=%ld\n", demuxer_get_percent_pos(demuxer));
+ mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_PERCENT_POSITION=%d\n", demuxer_get_percent_pos(demuxer));
} break;
case MP_CMD_GET_TIME_POS : {
float pos = 0;
--- MPlayer-20051225/mencoder.c.printf 2005-12-25 14:03:31.000000000 +0100
+++ MPlayer-20051225/mencoder.c 2005-12-25 15:47:36.000000000 +0100
@@ -950,8 +950,8 @@
mux_a->h.dwRate *= playback_speed;
mux_a->wf->nSamplesPerSec *= playback_speed;
mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy,
- mux_a->wf->wFormatTag, mux_a->wf->nChannels, (long)mux_a->wf->nSamplesPerSec,
- mux_a->wf->wBitsPerSample, (long)mux_a->wf->nAvgBytesPerSec, (long)mux_a->h.dwSampleSize);
+ mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec,
+ mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize);
break;
}
@@ -982,16 +982,16 @@
if (sh_audio && mux_a->codec == ACODEC_COPY) {
if (playback_speed != 1.0) mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoSpeedWithFrameCopy);
mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy,
- mux_a->wf->wFormatTag, mux_a->wf->nChannels, (long)mux_a->wf->nSamplesPerSec,
- mux_a->wf->wBitsPerSample, (long)mux_a->wf->nAvgBytesPerSec, (long)mux_a->h.dwSampleSize);
+ mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec,
+ mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize);
if (sh_audio->wf) {
if ((mux_a->wf->wFormatTag != sh_audio->wf->wFormatTag) ||
(mux_a->wf->nChannels != sh_audio->wf->nChannels) ||
(mux_a->wf->nSamplesPerSec != sh_audio->wf->nSamplesPerSec * playback_speed))
{
mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy,
- sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (long)(sh_audio->wf->nSamplesPerSec * playback_speed),
- sh_audio->wf->wBitsPerSample, (long)sh_audio->wf->nAvgBytesPerSec, 0L);
+ sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (int)(sh_audio->wf->nSamplesPerSec * playback_speed),
+ sh_audio->wf->wBitsPerSample, sh_audio->wf->nAvgBytesPerSec, 0);
mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_AudioCopyFileMismatch);
mencoder_exit(1,NULL);
}
@@ -1001,8 +1001,8 @@
(mux_a->wf->nSamplesPerSec != sh_audio->samplerate * playback_speed))
{
mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy,
- sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (long)(sh_audio->wf->nSamplesPerSec * playback_speed),
- sh_audio->wf->wBitsPerSample, (long)sh_audio->wf->nAvgBytesPerSec, 0L);
+ sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (int)(sh_audio->wf->nSamplesPerSec * playback_speed),
+ sh_audio->wf->wBitsPerSample, sh_audio->wf->nAvgBytesPerSec, 0);
mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_AudioCopyFileMismatch);
mencoder_exit(1,NULL);
}
More information about the MPlayer-dev-eng
mailing list