[Mplayer-cvslog] CVS: main/libmpcodecs ad_qtaudio.c, 1.13, 1.14 vd_qtvideo.c, 1.17, 1.18 ve_qtvideo.c, 1.9, 1.10 vf_phase.c, 1.1, 1.2

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv23141/libmpcodecs

Modified Files:
	ad_qtaudio.c vd_qtvideo.c ve_qtvideo.c vf_phase.c 
Log Message:
small gcc warning fixes


Index: ad_qtaudio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_qtaudio.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ad_qtaudio.c	12 Aug 2004 18:54:22 -0000	1.13
+++ ad_qtaudio.c	28 Aug 2004 20:59:49 -0000	1.14
@@ -92,7 +92,7 @@
     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;

Index: vd_qtvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_qtvideo.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vd_qtvideo.c	30 Apr 2004 10:26:26 -0000	1.17
+++ vd_qtvideo.c	28 Aug 2004 20:59:49 -0000	1.18
@@ -235,7 +235,7 @@
 //    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 @@
 	    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 @@
     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, 

Index: ve_qtvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_qtvideo.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ve_qtvideo.c	13 Apr 2004 15:04:25 -0000	1.9
+++ ve_qtvideo.c	28 Aug 2004 20:59:49 -0000	1.10
@@ -177,7 +177,7 @@
     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;

Index: vf_phase.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_phase.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vf_phase.c	29 Mar 2004 04:39:04 -0000	1.1
+++ vf_phase.c	28 Aug 2004 20:59:49 -0000	1.2
@@ -266,7 +266,7 @@
 	    return 0; /* bad args */
 	 }
 
-      if(args=strchr(args, ':')) args++;
+      if( (args=strchr(args, ':')) ) args++;
       }
 
    return 1;