diff options
| -rw-r--r-- | libmpcodecs/ad_qtaudio.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_qtvideo.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/ve_qtvideo.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf_phase.c | 2 | ||||
| -rw-r--r-- | libvo/vo_gl.c | 2 | ||||
| -rw-r--r-- | mp3lib/decod386.c | 4 |
6 files changed, 10 insertions, 8 deletions
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index b89d573d67..c595f2cad4 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -92,7 +92,7 @@ static int loader_init() Setup_LDT_Keeper(); #endif qtml_dll = LoadLibraryA("qtmlClient.dll"); - if( qtml_dll == NULL ) + if( qtml_dll == (HMODULE)NULL ) { mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading dll\n" ); return 1; diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index 2bd96f268c..c261511e8b 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -235,7 +235,7 @@ static int init(sh_video_t *sh){ // result = FindCodec ('SVQ1',anyCodec,&compressor,&decompressor ); // printf("FindCodec SVQ1 returned:%i compressor: 0x%X decompressor: 0x%X\n",result,compressor,decompressor); - sh->context = kYUVSPixelFormat; + sh->context = (void *)kYUVSPixelFormat; #if 1 { int imgfmt = sh->codec->outfmt[sh->outfmtidx]; @@ -275,7 +275,7 @@ static int init(sh_video_t *sh){ return(0); } mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"imgfmt: %s qt_imgfmt: %.4s\n", vo_format_name(imgfmt), &qt_imgfmt); - sh->context = qt_imgfmt; + sh->context = (void *)qt_imgfmt; if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,imgfmt)) return 0; } #else @@ -313,7 +313,7 @@ if(!codec_inited){ result = QTNewGWorldFromPtr( &OutBufferGWorld, // kYUVSPixelFormat, //pixel format of new GWorld == YUY2 - sh->context, + (OSType)sh->context, &OutBufferRect, //we should benchmark if yvu9 is faster for svq3, too 0, 0, diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c index c80fa38ead..be10d86942 100644 --- a/libmpcodecs/ve_qtvideo.c +++ b/libmpcodecs/ve_qtvideo.c @@ -177,7 +177,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ long framesizemax; UInt8 similarity=0; long compressedsize; - int in_format=kYUVSPixelFormat; + OSType in_format=kYUVSPixelFormat; int width = mpi->width; int height = mpi->height; int stride = width*2; diff --git a/libmpcodecs/vf_phase.c b/libmpcodecs/vf_phase.c index 67ad902153..1415d3dfdb 100644 --- a/libmpcodecs/vf_phase.c +++ b/libmpcodecs/vf_phase.c @@ -266,7 +266,7 @@ static int open(vf_instance_t *vf, char* args) return 0; /* bad args */ } - if(args=strchr(args, ':')) args++; + if( (args=strchr(args, ':')) ) args++; } return 1; diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 6606260817..2f3f68d027 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -362,7 +362,7 @@ static uint32_t preinit(const char *arg) slice_height = 4; if(arg) { - char *parse_pos = &arg[0]; + char *parse_pos = (char *)&arg[0]; while (parse_pos[0] && !parse_err) { if (strncmp (parse_pos, "manyfmts", 8) == 0) { parse_pos = &parse_pos[8]; diff --git a/mp3lib/decod386.c b/mp3lib/decod386.c index e80a654749..686debad17 100644 --- a/mp3lib/decod386.c +++ b/mp3lib/decod386.c @@ -77,6 +77,8 @@ } */ +static int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt); + static int synth_1to1_mono(real *bandPtr,unsigned char *samples,int *pnt) { short samples_tmp[64]; @@ -116,7 +118,7 @@ static int synth_1to1_mono2stereo(real *bandPtr,unsigned char *samples,int *pnt) static synth_func_t synth_func; #if defined(CAN_COMPILE_X86_ASM) -static int synth_1to1_MMX( real *bandPtr,int channel,short * samples) +int synth_1to1_MMX( real *bandPtr,int channel,short * samples) { static short buffs[2][2][0x110]; static int bo = 1; |