summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-29 19:19:31 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-29 19:19:31 +0000
commit19bfd0d791691a033aacea744587ab38b44e6af4 (patch)
treeb0b36dabcf68bfdb99fac3c225d9806e9f92ad7b /libmpcodecs
parent0722c4d0a5ae6870d9bbe84a07e32493a74c05cb (diff)
downloadmpv-19bfd0d791691a033aacea744587ab38b44e6af4.tar.bz2
mpv-19bfd0d791691a033aacea744587ab38b44e6af4.tar.xz
warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7558 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ad_realaud.c4
-rw-r--r--libmpcodecs/vd_realvid.c4
-rw-r--r--libmpcodecs/ve_libdv.c2
-rw-r--r--libmpcodecs/ve_vfw.c4
-rw-r--r--libmpcodecs/vf_fame.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c
index ae94bf097f..3fa812b16d 100644
--- a/libmpcodecs/ad_realaud.c
+++ b/libmpcodecs/ad_realaud.c
@@ -33,10 +33,10 @@ void *__ctype_b=NULL;
#endif
static unsigned long (*raCloseCodec)(void*);
-static unsigned long (*raDecode)(void*, char*,unsigned long,char*,unsigned long*,long);
+static unsigned long (*raDecode)(void*, char*,unsigned long,char*,unsigned int*,long);
static unsigned long (*raFlush)(unsigned long,unsigned long,unsigned long);
static unsigned long (*raFreeDecoder)(void*);
-static unsigned long (*raGetFlavorProperty)(void*,unsigned long,unsigned long,int*);
+static void* (*raGetFlavorProperty)(void*,unsigned long,unsigned long,int*);
//static unsigned long (*raGetNumberOfFlavors2)(void);
static unsigned long (*raInitDecoder)(void*, void*);
static unsigned long (*raOpenCodec2)(void*);
diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c
index 89b526f6e2..38be409265 100644
--- a/libmpcodecs/vd_realvid.c
+++ b/libmpcodecs/vd_realvid.c
@@ -168,7 +168,7 @@ static int init(sh_video_t *sh){
// setup rv30 codec (codec sub-type and image dimensions):
if(extrahdr[1]>=0x20200002){
unsigned long cmsg24[4]={sh->disp_w,sh->disp_h,sh->disp_w,sh->disp_h};
- unsigned long cmsg_data[3]={0x24,1+((extrahdr[0]>>16)&7),&cmsg24};
+ unsigned long cmsg_data[3]={0x24,1+((extrahdr[0]>>16)&7),(unsigned long) &cmsg24};
(*rvyuv_custom_message)(cmsg_data,sh->context);
}
mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: RealVideo codec init OK!\n");
@@ -202,7 +202,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
dp_hdr->len, // length of the packet (sub-packets appended)
0, // unknown, seems to be unused
dp_hdr->chunks, // number of sub-packets - 1
- extra, // table of sub-packet offsets
+ (unsigned long) extra, // table of sub-packet offsets
0, // unknown, seems to be unused
dp_hdr->timestamp,// timestamp (the integer value from the stream)
};
diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c
index ed06abb517..221a0354c7 100644
--- a/libmpcodecs/ve_libdv.c
+++ b/libmpcodecs/ve_libdv.c
@@ -91,7 +91,7 @@ static int vf_open(vf_instance_t *vf, char* args){
vf->put_image=put_image;
vf->priv=malloc(sizeof(struct vf_priv_s));
memset(vf->priv,0,sizeof(struct vf_priv_s));
- vf->priv->mux=args;
+ vf->priv->mux=(aviwrite_stream_t*)args;
vf->priv->enc=dv_encoder_new(1,1,1); // FIXME, parse some options!
if(!vf->priv->enc) return 0;
diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c
index eaf1c97446..b97845d14d 100644
--- a/libmpcodecs/ve_vfw.c
+++ b/libmpcodecs/ve_vfw.c
@@ -42,7 +42,7 @@ struct vf_priv_s {
BITMAPINFOHEADER* bih;
};
-static int encoder_hic=0;
+static HIC encoder_hic;
static void* encoder_buf=NULL;
static int encoder_buf_size=0;
static int encoder_frameno=0;
@@ -62,7 +62,7 @@ static BITMAPINFOHEADER* vfw_open_encoder(char *dll_name, BITMAPINFOHEADER *inpu
// output_bih->biSize = sizeof(BITMAPINFOHEADER);
// encoder_hic = ICOpen( 0x63646976, out_fourcc, ICMODE_COMPRESS);
- encoder_hic = ICOpen( dll_name, out_fourcc, ICMODE_COMPRESS);
+ encoder_hic = ICOpen( (long) dll_name, out_fourcc, ICMODE_COMPRESS);
if(!encoder_hic){
mp_msg(MSGT_WIN32,MSGL_ERR,"ICOpen failed! unknown codec / wrong parameters?\n");
return NULL;
diff --git a/libmpcodecs/vf_fame.c b/libmpcodecs/vf_fame.c
index bba975b208..a996019aa8 100644
--- a/libmpcodecs/vf_fame.c
+++ b/libmpcodecs/vf_fame.c
@@ -73,7 +73,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
vf->priv->pes.id=0x1E0;
vf->priv->pes.timestamp=-1; // dunno
- dmpi->planes[0]=&vf->priv->pes;
+ dmpi->planes[0]=(void*) &vf->priv->pes;
return vf_next_put_image(vf,dmpi);
}