diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-28 22:45:48 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-28 22:45:48 +0000 |
commit | 0f4f7e27cfb46b45c558a35f01f400f193e9bc7b (patch) | |
tree | f27ceba2bcee81f1e5c4bb9123a106a43b755891 /libmpcodecs | |
parent | f4e1671be7e80209be7bc9179c0d64cb1234af20 (diff) | |
download | mpv-0f4f7e27cfb46b45c558a35f01f400f193e9bc7b.tar.bz2 mpv-0f4f7e27cfb46b45c558a35f01f400f193e9bc7b.tar.xz |
mostly compiler warning fixes, some small bugfix
patch by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7128 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_a52.c | 2 | ||||
-rw-r--r-- | libmpcodecs/native/nuppelvideo.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_real.c | 5 | ||||
-rw-r--r-- | libmpcodecs/vd_svq1.c | 8 | ||||
-rw-r--r-- | libmpcodecs/ve_divx4.c | 3 | ||||
-rw-r--r-- | libmpcodecs/ve_lavc.c | 3 | ||||
-rw-r--r-- | libmpcodecs/ve_libdv.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ve_rawrgb.c | 4 | ||||
-rw-r--r-- | libmpcodecs/ve_vfw.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_lavc.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_palette.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_pp.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_rectangle.c | 2 |
15 files changed, 34 insertions, 11 deletions
diff --git a/libmpcodecs/ad_a52.c b/libmpcodecs/ad_a52.c index 4add05c09f..cc85fe0004 100644 --- a/libmpcodecs/ad_a52.c +++ b/libmpcodecs/ad_a52.c @@ -186,7 +186,7 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m mp_msg(MSGT_DECAUDIO,MSGL_WARN,"a52: error at resampling\n"); break; } - len+=2*a52_resample(a52_samples,&buf[len]); + len+=2*a52_resample(a52_samples,(int16_t *)&buf[len]); } return len; } diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c index 0cb38932fd..8b82d8a4e3 100644 --- a/libmpcodecs/native/nuppelvideo.c +++ b/libmpcodecs/native/nuppelvideo.c @@ -44,7 +44,7 @@ void decode_nuv( unsigned char *encoded, int encoded_size, /* tables are in encoded */ if (encodedh->comptype == 'R') { - RTjpeg_init_decompress ( encoded+12, width, height ); + RTjpeg_init_decompress ( (unsigned long *)(encoded+12), width, height ); mp_msg(MSGT_DECVIDEO, MSGL_V, "Found RTjpeg tables (size: %d, width: %d, height: %d)\n", encoded_size-12, width, height); } diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 8c9504341b..71546b3e0e 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -258,7 +258,7 @@ static void draw_slice(struct AVCodecContext *s, } }else #endif - mpcodecs_draw_slice (sh,src, stride, width, height, 0, y); + mpcodecs_draw_slice (sh,(unsigned char*)src, stride, width, height, 0, y); } static int init_vo(sh_video_t *sh){ diff --git a/libmpcodecs/vd_real.c b/libmpcodecs/vd_real.c index 9d2a00d885..e89ea55338 100644 --- a/libmpcodecs/vd_real.c +++ b/libmpcodecs/vd_real.c @@ -93,6 +93,11 @@ int load_syms_linux(char *path) { } #ifdef USE_WIN32DLL + +#include "../loader/ldt_keeper.h" +void* LoadLibraryA(char* name); +void* GetProcAddress(void* handle,char* func); + int load_syms_windows(char *path) { void *handle; Setup_LDT_Keeper(); diff --git a/libmpcodecs/vd_svq1.c b/libmpcodecs/vd_svq1.c index a639399001..feaf2b2c4a 100644 --- a/libmpcodecs/vd_svq1.c +++ b/libmpcodecs/vd_svq1.c @@ -17,6 +17,14 @@ static vd_info_t info = { LIBVD_EXTERN(svq1) +#ifdef USE_LIBAVCODEC +#ifdef USE_LIBAVCODEC_SO +#include <ffmpeg/avcodec.h> +#else +#include "libavcodec/avcodec.h" +#endif +#endif + #include "native/svq1.h" // to set/get/query special features/parameters diff --git a/libmpcodecs/ve_divx4.c b/libmpcodecs/ve_divx4.c index 9700857f89..447d2e57d4 100644 --- a/libmpcodecs/ve_divx4.c +++ b/libmpcodecs/ve_divx4.c @@ -24,6 +24,7 @@ extern int pass; extern char* passtmpfile; +extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); #include <encore2.h> @@ -195,7 +196,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; mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)); mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 6412669876..3f77659904 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -26,6 +26,7 @@ extern char* passtmpfile; extern int pass; +extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); //===========================================================================// @@ -445,7 +446,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; /* XXX: hack: some of the MJPEG decoder DLL's needs exported huffman table, so we define a zero-table, also lavc mjpeg encoder is putting diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c index d06b514d24..67facec9d9 100644 --- a/libmpcodecs/ve_libdv.c +++ b/libmpcodecs/ve_libdv.c @@ -23,6 +23,8 @@ #include <libdv/dv.h> +extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); + #ifndef DV_WIDTH #define DV_WIDTH 720 #define DV_PAL_HEIGHT 576 diff --git a/libmpcodecs/ve_rawrgb.c b/libmpcodecs/ve_rawrgb.c index 95d4e576ef..21ad8f400a 100644 --- a/libmpcodecs/ve_rawrgb.c +++ b/libmpcodecs/ve_rawrgb.c @@ -16,6 +16,8 @@ #include "mp_image.h" #include "vf.h" +extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); + //===========================================================================// struct vf_priv_s { @@ -58,7 +60,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; mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)); mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index 0fb85c2daf..bfbdbae5d3 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -18,6 +18,8 @@ #include "mp_image.h" #include "vf.h" +extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); + //===========================================================================// #include "dll_init.h" @@ -83,7 +85,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; vfw_bih=malloc(sizeof(BITMAPINFOHEADER)); vfw_bih->biSize=sizeof(BITMAPINFOHEADER); diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 5cd56cfce9..9638c16236 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -2,11 +2,11 @@ #include <stdlib.h> #include <string.h> +#include "../config.h" #ifdef HAVE_MALLOC_H #include <malloc.h> #endif -#include "../config.h" #include "../mp_msg.h" #include "../help_mp.h" diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c index d5cb90060a..7acfcd75b0 100644 --- a/libmpcodecs/vf_lavc.c +++ b/libmpcodecs/vf_lavc.c @@ -104,7 +104,7 @@ static void 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]=(unsigned char*)&vf->priv->pes; vf_next_put_image(vf,dmpi); } diff --git a/libmpcodecs/vf_palette.c b/libmpcodecs/vf_palette.c index 3aa9a859d2..f5b2df2097 100644 --- a/libmpcodecs/vf_palette.c +++ b/libmpcodecs/vf_palette.c @@ -81,7 +81,7 @@ static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){ MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h); - if(!mpi->planes[1]) mpi->planes[1]=gray_pal; + if(!mpi->planes[1]) mpi->planes[1]=(unsigned char*)gray_pal; if(mpi->w==mpi->stride[0] && dmpi->w*(dmpi->bpp>>3)==dmpi->stride[0]){ // no stride conversion needed diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index 3e5e01ec34..6b5c005db0 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -98,7 +98,7 @@ static unsigned int fmt_list[]={ IMGFMT_YV12, IMGFMT_I420, IMGFMT_IYUV, - NULL + 0 }; static int open(vf_instance_t *vf, char* args){ diff --git a/libmpcodecs/vf_rectangle.c b/libmpcodecs/vf_rectangle.c index 10ba44de09..50f33a8cec 100644 --- a/libmpcodecs/vf_rectangle.c +++ b/libmpcodecs/vf_rectangle.c @@ -4,6 +4,8 @@ #include "mp_image.h" #include "vf.h" +#include "../libvo/fastmemcpy.h" + struct vf_priv_s { int x, y, w, h; }; |