summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorvoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-10 14:29:44 +0000
committervoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-10 14:29:44 +0000
commita08444432eb7e9c67fb9e3f7c1ca4e04ad7c8c47 (patch)
treeb9f44d459d7c03c94908bf425610a966d5faee7c /loader
parent8228670a2e16502d0c22e62590a9caabbc2ff919 (diff)
downloadmpv-a08444432eb7e9c67fb9e3f7c1ca4e04ad7c8c47.tar.bz2
mpv-a08444432eb7e9c67fb9e3f7c1ca4e04ad7c8c47.tar.xz
Fix for:
dshow/mediatype.c:47: warning: format '%02d' expects type 'int', but argument 5 has type 'long unsigned int' dshow/mediatype.c:74: warning: format '%d' expects type 'int', but argument 4 has type 'DWORD' dshow/mediatype.c:77: warning: format '%d' expects type 'int', but argument 4 has type 'DWORD' dshow/mediatype.c:84: warning: format '%d' expects type 'int', but argument 4 has type 'long int' dshow/mediatype.c:85: warning: format '%d' expects type 'int', but argument 4 has type 'long int' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24416 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
-rw-r--r--loader/dshow/mediatype.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/loader/dshow/mediatype.c b/loader/dshow/mediatype.c
index d7ce98a94b..a32b292af1 100644
--- a/loader/dshow/mediatype.c
+++ b/loader/dshow/mediatype.c
@@ -44,7 +44,7 @@ void DisplayMediaType(const char * label,const AM_MEDIA_TYPE* pmt){
if((i+1)%8==0) Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"\n");
}
if((i)%8!=0) Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"\n");
- Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"-(Ptr:%p)--(%02d)--\n",pmt->pbFormat,pmt->cbFormat);
+ Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"-(Ptr:%p)--(%lu)--\n",pmt->pbFormat,pmt->cbFormat);
for(i=0;i<pmt->cbFormat;i++){
Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"%02x ",(BYTE)pmt->pbFormat[i]);
if((i+1)%8==0) Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"\n");
@@ -71,21 +71,21 @@ void DisplayMediaType(const char * label,const AM_MEDIA_TYPE* pmt){
if(pmt && memcmp(&pmt->formattype,&FORMAT_WaveFormatEx,16)==0 && pmt->pbFormat){
pWF=(WAVEFORMATEX*)pmt->pbFormat;
Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"PMT: nChannels %d\n",pWF->nChannels);
- Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"PMT: nSamplesPerSec %d\n",pWF->nSamplesPerSec);
+ Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"PMT: nSamplesPerSec %ld\n",pWF->nSamplesPerSec);
Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"PMT: wBitsPerSample %d\n",pWF->wBitsPerSample);
Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"PMT: nBlockAlign %d\n",pWF->nBlockAlign);
- Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"PMT: nAvgBytesPerSec %d\n",pWF->nAvgBytesPerSec);
+ Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"PMT: nAvgBytesPerSec %ld\n",pWF->nAvgBytesPerSec);
Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"PMT: SampleSize %ld\n",pmt->lSampleSize);
}
if(pmt && memcmp(&pmt->formattype,&FORMAT_VideoInfo,16)==0 && pmt->pbFormat){
Vhdr=(VIDEOINFOHEADER*)pmt->pbFormat;
Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"Vhdr: dwBitRate %ld\n",Vhdr->dwBitRate);
Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"Vhdr: biWidth %ld\n",Vhdr->bmiHeader.biWidth);
- Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"Vhdr: biHeight %d\n",Vhdr->bmiHeader.biHeight);
- Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"Vhdr: biSizeImage %d\n",Vhdr->bmiHeader.biSizeImage);
+ Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"Vhdr: biHeight %ld\n",Vhdr->bmiHeader.biHeight);
+ Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"Vhdr: biSizeImage %ld\n",Vhdr->bmiHeader.biSizeImage);
Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"Vhdr: biBitCount %d\n",Vhdr->bmiHeader.biBitCount);
if(Vhdr->bmiHeader.biCompression){
- Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"Vhdr: biComression 0x%08x (%s)\n",Vhdr->bmiHeader.biCompression,vo_format_name(Vhdr->bmiHeader.biCompression));
+ Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"Vhdr: biComression 0x%08lx (%s)\n",Vhdr->bmiHeader.biCompression,vo_format_name(Vhdr->bmiHeader.biCompression));
}else
Debug mp_msg(MSGT_LOADER,MSGL_DBG4,"Vhdr: biComression 0x00000000\n");