Mercurial > mplayer.hg
changeset 7557:f296ff05bcd0
warning fixes
| author | arpi |
|---|---|
| date | Sun, 29 Sep 2002 19:19:31 +0000 |
| parents | 85c8a8a8f4fd |
| children | f89b4a70dbda |
| files | libmpcodecs/ad_realaud.c libmpcodecs/vd_realvid.c libmpcodecs/ve_libdv.c libmpcodecs/ve_vfw.c libmpcodecs/vf_fame.c |
| diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ad_realaud.c Sun Sep 29 19:00:43 2002 +0000 +++ b/libmpcodecs/ad_realaud.c Sun Sep 29 19:19:31 2002 +0000 @@ -33,10 +33,10 @@ #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*);
--- a/libmpcodecs/vd_realvid.c Sun Sep 29 19:00:43 2002 +0000 +++ b/libmpcodecs/vd_realvid.c Sun Sep 29 19:19:31 2002 +0000 @@ -168,7 +168,7 @@ // 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 @@ 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) };
--- a/libmpcodecs/ve_libdv.c Sun Sep 29 19:00:43 2002 +0000 +++ b/libmpcodecs/ve_libdv.c Sun Sep 29 19:19:31 2002 +0000 @@ -91,7 +91,7 @@ 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;
--- a/libmpcodecs/ve_vfw.c Sun Sep 29 19:00:43 2002 +0000 +++ b/libmpcodecs/ve_vfw.c Sun Sep 29 19:19:31 2002 +0000 @@ -42,7 +42,7 @@ 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 @@ // 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;
--- a/libmpcodecs/vf_fame.c Sun Sep 29 19:00:43 2002 +0000 +++ b/libmpcodecs/vf_fame.c Sun Sep 29 19:19:31 2002 +0000 @@ -73,7 +73,7 @@ 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); }