Merge remote-tracking branch 'origin/master' into my_master

Conflicts:
	command.c
	mp_core.h
	mplayer.c
	screenshot.c

5 files changed, 8 insertions, 7 deletions

diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c
index b6c7ef6299..1edd87cd17 100644
--- a/libmpcodecs/ad_qtaudio.c
+++ b/libmpcodecs/ad_qtaudio.c
@@ -300,7 +300,6 @@ static void uninit(sh_audio_t *sh){
 }
 
 static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen){
-    int error;
     unsigned long FramesToGet=0; //how many frames the demuxer has to get
     unsigned long InputBufferSize=0; //size of the input buffer
     unsigned long ConvertedFrames=0;
@@ -331,7 +330,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
 
 //    printf("\nSoundConverterConvertBuffer(myConv=%p,inbuf=%p,frames=%d,outbuf=%p,&convframes=%p,&convbytes=%p)\n",
 //	myConverter,sh->a_in_buffer,FramesToGet,buf,&ConvertedFrames,&ConvertedBytes);
-    error = SoundConverterConvertBuffer(myConverter,sh->a_in_buffer,
+    SoundConverterConvertBuffer(myConverter,sh->a_in_buffer,
 	FramesToGet,buf,&ConvertedFrames,&ConvertedBytes);
 //    printf("SoundConverterConvertBuffer:%i\n",error);
 //    printf("ConvertedFrames = %li\n",ConvertedFrames);
diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c
index 954ca17809..9aa304e4fc 100644
--- a/libmpcodecs/ad_twin.c
+++ b/libmpcodecs/ad_twin.c
@@ -54,8 +54,8 @@ static void (*TvqUpdateVectorInfo)(int varbits, int *ndiv, int bits0[], int bits
 
 static int   (*TvqCheckVersion)(char *versionID);
 static void  (*TvqGetConfInfo)(tvqConfInfo *cf);
-static int   (*TvqGetFrameSize)();
-static int   (*TvqGetNumFixedBitsPerFrame)();
+static int   (*TvqGetFrameSize)(void);
+static int   (*TvqGetNumFixedBitsPerFrame)(void);
 
 #define BYTE_BIT    8
 #define BBUFSIZ     1024        /* Bit buffer size (bytes) */
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c
index d3dbeacc45..5e37ca456e 100644
--- a/libmpcodecs/vd_qtvideo.c
+++ b/libmpcodecs/vd_qtvideo.c
@@ -129,7 +129,7 @@ static int init(sh_video_t *sh){
     DecompressSequenceFrameS = (OSErr (*)(ImageSequence,Ptr,long,CodecFlags,CodecFlags*,ICMCompletionProcRecordPtr))GetProcAddress(handler, "DecompressSequenceFrameS");
     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");
+    NewHandleClear = (Handle(*)(Size))GetProcAddress(handler, "NewHandleClear");
     DisposeHandle = (void (*)(Handle))GetProcAddress(handler, "DisposeHandle");
     DisposeGWorld = (void (*)(GWorldPtr))GetProcAddress(handler, "DisposeGWorld");
     CDSequenceEnd = (OSErr (*)(ImageSequence))GetProcAddress(handler, "CDSequenceEnd");
diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c
index 55cc1642f0..331755a2b1 100644
--- a/libmpcodecs/vd_vfw.c
+++ b/libmpcodecs/vd_vfw.c
@@ -153,7 +153,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
 static int init(sh_video_t *sh){
     HRESULT ret;
 //    unsigned int outfmt=sh->codec->outfmt[sh->outfmtidx];
-    int i, o_bih_len;
+    int o_bih_len;
     vd_vfw_ctx *priv;
 
     /* Hack for VSSH codec: new dll can't decode old files
@@ -198,7 +198,7 @@ static int init(sh_video_t *sh){
     ret = ICDecompressGetFormat(priv->handle, sh->bih, priv->o_bih);
     if(ret < 0){
 	mp_msg(MSGT_WIN32,MSGL_ERR,"ICDecompressGetFormat failed: Error %d\n", (int)ret);
-	for (i=0; i < o_bih_len; i++) mp_msg(MSGT_WIN32, MSGL_DBG2, "%02x ", priv->o_bih[i]);
+	//for (i=0; i < o_bih_len; i++) mp_msg(MSGT_WIN32, MSGL_DBG2, "%02x ", priv->o_bih[i]);
 	return 0;
     }
     mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressGetFormat OK\n");
diff --git a/libmpcodecs/vf_remove_logo.c b/libmpcodecs/vf_remove_logo.c
index da90d3c066..1270f5e6c9 100644
--- a/libmpcodecs/vf_remove_logo.c
+++ b/libmpcodecs/vf_remove_logo.c
@@ -86,6 +86,8 @@
 #include <ctype.h>
 #include <inttypes.h>
 
+#include "osdep/io.h"
+
 #include "config.h"
 #include "mp_msg.h"
 #include "libvo/fastmemcpy.h"