compiler warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8734 b3059339-0415-0410-9bf9-f77b7e298cf2

5 files changed, 22 insertions, 16 deletions

diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c
index e8d292fa79..af10217d0d 100644
--- a/libmpcodecs/ve_qtvideo.c
+++ b/libmpcodecs/ve_qtvideo.c
@@ -16,6 +16,10 @@
 #include "../loader/qtx/qtxsdk/components.h"
 #include "wine/windef.h"
 
+#ifdef USE_WIN32DLL
+#include "ldt_keeper.h"
+#endif
+
 #include "codec-cfg.h"
 #include "stream.h"
 #include "demuxer.h"
@@ -292,18 +296,18 @@ static int vf_open(vf_instance_t *vf, char* args){
 
     Setup_LDT_Keeper();
     handler = LoadLibraryA("qtmlClient.dll");
-    InitializeQTML = GetProcAddress(handler, "InitializeQTML");
-    GetGWorldPixMap = GetProcAddress(handler, "GetGWorldPixMap");
-    QTNewGWorldFromPtr = GetProcAddress(handler, "QTNewGWorldFromPtr");
-    NewHandleClear = GetProcAddress(handler, "NewHandleClear");
-    FindCodec = GetProcAddress(handler,"FindCodec");
-    CompressSequenceBegin = GetProcAddress(handler,"CompressSequenceBegin");
-    CompressSequenceFrame = GetProcAddress(handler,"CompressSequenceFrame");
-    GetMaxCompressionSize = GetProcAddress(handler,"GetMaxCompressionSize");
-    CDSequenceEnd = GetProcAddress(handler,"CDSequenceEnd");
-    FindNextComponent = GetProcAddress(handler, "FindNextComponent");
-    CountComponents = GetProcAddress(handler, "CountComponents");
-    GetComponentInfo = GetProcAddress(handler, "GetComponentInfo");
+    InitializeQTML = (OSErr (*)(long))GetProcAddress(handler, "InitializeQTML");
+    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");
+    FindCodec = (OSErr (*)(CodecType,CodecComponent,CompressorComponent *,DecompressorComponent *))GetProcAddress(handler,"FindCodec");
+    CompressSequenceBegin = (OSErr(*)(ImageSequence *,PixMapHandle,PixMapHandle,const Rect *,const Rect *,short,CodecType,CompressorComponent,CodecQ,CodecQ,long,CTabHandle,CodecFlags,ImageDescriptionHandle))GetProcAddress(handler,"CompressSequenceBegin");
+    CompressSequenceFrame = (OSErr(*)(ImageSequence,PixMapHandle,const Rect *,CodecFlags,Ptr,long *,UInt8 *,ICMCompletionProcRecordPtr))GetProcAddress(handler,"CompressSequenceFrame");
+    GetMaxCompressionSize = (OSErr(*)(PixMapHandle,const Rect *,short,CodecQ,CodecType,CompressorComponent,long *))GetProcAddress(handler,"GetMaxCompressionSize");
+    CDSequenceEnd = (OSErr (*)(ImageSequence))GetProcAddress(handler,"CDSequenceEnd");
+    FindNextComponent = (Component (*)(Component,ComponentDescription*))GetProcAddress(handler, "FindNextComponent");
+    CountComponents = (long (*)(ComponentDescription*))GetProcAddress(handler, "CountComponents");
+    GetComponentInfo = (OSErr (*)(Component,ComponentDescription*,Handle,Handle,Handle))GetProcAddress(handler, "GetComponentInfo");
     if(!InitializeQTML  ||!CompressSequenceBegin){
         printf("invalid qt DLL!\n");
         return 0;
diff --git a/mplayer.c b/mplayer.c
index 4b50cfb06a..1a81fe0cf5 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -857,7 +857,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
        next_edl_record->next = NULL;
      } else {
        if( ( edl_fd = fopen( edl_output_filename, "w" ) ) == NULL ) {
-	 printf( "Error opening file [%s] for writing!\n" );
+	 printf( "Error opening file [%s] for writing!\n", edl_output_filename );
 	 edl_output_filename = NULL;
 	 next_edl_record->next = NULL;
        }
diff --git a/subreader.h b/subreader.h
index 401a0cd0ad..4022d4fc8a 100644
--- a/subreader.h
+++ b/subreader.h
@@ -39,6 +39,8 @@ typedef struct {
 
 subtitle* sub_read_file (char *filename, float pts);
 subtitle* subcp_recode1 (subtitle *sub);
+void subcp_open (void); /* for demux_ogg.c */
+void subcp_close (void); /* for demux_ogg.c */
 char * sub_filename(char *path, char * fname);
 void list_sub_file(subtitle* subs);
 void dump_srt(subtitle* subs, float fps);
diff --git a/vidix/drivers/cyberblade_regs.h b/vidix/drivers/cyberblade_regs.h
index 486ceaf3bc..4b0c2b1b81 100644
--- a/vidix/drivers/cyberblade_regs.h
+++ b/vidix/drivers/cyberblade_regs.h
@@ -135,12 +135,12 @@ int HACKBUCKET12345678;  /* Horrible hack to work around cache/speed issue */
 #define OUTW(addr,val) (*(unsigned short *)(cyberblade_reg_base+addr)=(val))
 
 #define SRINB(reg) (OUTB(0x3c4,reg), INB(0x3c5))
-#define SROUTB(reg,val) (OUTW(0x3c4,(val)<<8|reg))
+#define SROUTB(reg,val) (OUTW(0x3c4,((val)<<8)|(reg)))
 
 #define CRINB(reg) \
 	(OUTB(cyberblade_crtc+4,reg), INB(cyberblade_crtc+5))
 
 #define CROUTB(reg,val) \
-	(OUTW(cyberblade_crtc+4,(val)<<8|reg))
+	(OUTW(cyberblade_crtc+4,((val)<<8)|(reg)))
 
 /* --- */
diff --git a/vobsub.c b/vobsub.c
index 1be1edcd35..671d30ac98 100644
--- a/vobsub.c
+++ b/vobsub.c
@@ -1161,7 +1161,7 @@ vobsub_set_from_lang(void *vobhandle, unsigned char * lang)
           if ((strncmp(vob->spu_streams[i].id, lang, 2)==0)){
 	    vobsub_id=i;
 	    mp_msg(MSGT_VOBSUB, MSGL_INFO, "Selected VOBSUB language: %d language: %s\n", i, vob->spu_streams[i].id);
-	    return;
+	    return 0;
 	  }
       lang+=2;while (lang[0]==',' || lang[0]==' ') ++lang;
     }