Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv30768/libmpcodecs Modified Files: ad_qtaudio.c vd_lcl.c vd_qtvideo.c Log Message: compiler warning fixes based on patch by Dominik Mierzejewski <dominik@rangers.eu.org> Index: ad_qtaudio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_qtaudio.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ad_qtaudio.c 7 Dec 2002 02:26:45 -0000 1.5 +++ ad_qtaudio.c 14 Dec 2002 17:55:56 -0000 1.6 @@ -10,6 +10,10 @@ #include "ad_internal.h" #include "bswap.h" +#ifdef USE_WIN32DLL +#include "ldt_keeper.h" +#endif + static ad_info_t info = { "QuickTime Audio Decoder", "qtaudio", Index: vd_lcl.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_lcl.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vd_lcl.c 2 Sep 2002 20:10:10 -0000 1.2 +++ vd_lcl.c 14 Dec 2002 17:55:56 -0000 1.3 @@ -491,7 +491,8 @@ for (row = 0; row < height; row++) { pixel_ptr = row * width * 3; yq = encoded[pixel_ptr++]; - uqvq = encoded[pixel_ptr++] + (encoded[pixel_ptr++] << 8); + uqvq = encoded[pixel_ptr++]; + uqvq+=(encoded[pixel_ptr++] << 8); for (col = 1; col < width; col++) { encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; uqvq -= (encoded[pixel_ptr+1] | (encoded[pixel_ptr+2]<<8)); @@ -505,7 +506,8 @@ for (row = 0; row < height; row++) { pixel_ptr = row * width * 3; yq = encoded[pixel_ptr++]; - uqvq = encoded[pixel_ptr++] + (encoded[pixel_ptr++] << 8); + uqvq = encoded[pixel_ptr++]; + uqvq+=(encoded[pixel_ptr++] << 8); for (col = 1; col < width; col++) { encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; uqvq -= (encoded[pixel_ptr+1] | (encoded[pixel_ptr+2]<<8)); Index: vd_qtvideo.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_qtvideo.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vd_qtvideo.c 11 Dec 2002 22:07:03 -0000 1.10 +++ vd_qtvideo.c 14 Dec 2002 17:55:56 -0000 1.11 @@ -8,6 +8,10 @@ #include "mp_msg.h" #include "vd_internal.h" +#ifdef USE_WIN32DLL +#include "ldt_keeper.h" +#endif + static vd_info_t info = { "Quicktime Video decoder", "qtvideo", @@ -100,20 +104,20 @@ handler = LoadLibraryA("qtmlClient.dll"); - InitializeQTML = GetProcAddress(handler, "InitializeQTML"); - EnterMovies = GetProcAddress(handler, "EnterMovies"); - FindNextComponent = GetProcAddress(handler, "FindNextComponent"); - CountComponents = GetProcAddress(handler, "CountComponents"); - GetComponentInfo = GetProcAddress(handler, "GetComponentInfo"); - OpenComponent = GetProcAddress(handler, "OpenComponent"); - ImageCodecInitialize = GetProcAddress(handler, "ImageCodecInitialize"); - ImageCodecGetCodecInfo = GetProcAddress(handler, "ImageCodecGetCodecInfo"); - ImageCodecBeginBand = GetProcAddress(handler, "ImageCodecBeginBand"); - ImageCodecPreDecompress = GetProcAddress(handler, "ImageCodecPreDecompress"); - ImageCodecBandDecompress = GetProcAddress(handler, "ImageCodecBandDecompress"); - GetGWorldPixMap = GetProcAddress(handler, "GetGWorldPixMap"); - QTNewGWorldFromPtr = GetProcAddress(handler, "QTNewGWorldFromPtr"); - NewHandleClear = GetProcAddress(handler, "NewHandleClear"); + InitializeQTML = (OSErr (*)(long))GetProcAddress(handler, "InitializeQTML"); + EnterMovies = (OSErr (*)(void))GetProcAddress(handler, "EnterMovies"); + FindNextComponent = (Component (*)(Component,ComponentDescription*))GetProcAddress(handler, "FindNextComponent"); + CountComponents = (long (*)(ComponentDescription*))GetProcAddress(handler, "CountComponents"); + GetComponentInfo = (OSErr (*)(Component,ComponentDescription*,Handle,Handle,Handle))GetProcAddress(handler, "GetComponentInfo"); + OpenComponent = (ComponentInstance (*)(Component))GetProcAddress(handler, "OpenComponent"); + ImageCodecInitialize = (ComponentResult (*)(ComponentInstance,ImageSubCodecDecompressCapabilities *))GetProcAddress(handler, "ImageCodecInitialize"); + ImageCodecGetCodecInfo = (ComponentResult (*)(ComponentInstance,CodecInfo *))GetProcAddress(handler, "ImageCodecGetCodecInfo"); + ImageCodecBeginBand = (ComponentResult (*)(ComponentInstance,CodecDecompressParams *,ImageSubCodecDecompressRecord *,long))GetProcAddress(handler, "ImageCodecBeginBand"); + ImageCodecPreDecompress = (ComponentResult (*)(ComponentInstance,CodecDecompressParams *))GetProcAddress(handler, "ImageCodecPreDecompress"); + ImageCodecBandDecompress = (ComponentResult (*)(ComponentInstance,CodecDecompressParams *))GetProcAddress(handler, "ImageCodecBandDecompress"); + GetGWorldPixMap = (PixMapHandle (*)(GWorldPtr))GetProcAddress(handler, "GetGWorldPixMap"); + QTNewGWorldFromPtr = (OSErr(*)(GWorldPtr *,OSType,const Rect *,CTabHandle,void*,GWorldFlags,void *,long))GetProcAddress(handler, "QTNewGWorldFromPtr"); + NewHandleClear = (OSErr(*)(Size))GetProcAddress(handler, "NewHandleClear"); // = GetProcAddress(handler, ""); if(!InitializeQTML || !EnterMovies || !FindNextComponent || !ImageCodecBandDecompress){ @@ -371,7 +375,7 @@ if((int)sh->context==0x73797639){ // Sorenson 16-bit YUV -> std YVU9 - short *src0=((char*)decpar.dstPixMap.baseAddr+0x20); + short *src0=(short *)((char*)decpar.dstPixMap.baseAddr+0x20); for(i=0;i<mpi->h;i++){ int x;