diff options
author | 2002-09-22 02:33:28 +0000 | |
---|---|---|
committer | 2002-09-22 02:33:28 +0000 | |
commit | d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb (patch) | |
tree | 8f1d76f283da6022022a35e300c30faf93e71e83 /libmpcodecs | |
parent | 61c5a99851ea41449a513619dd68791c93e30ef3 (diff) |
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_realaud.c | 19 | ||||
-rw-r--r-- | libmpcodecs/dec_video.h | 1 | ||||
-rw-r--r-- | libmpcodecs/vd_ijpg.c | 1 | ||||
-rw-r--r-- | libmpcodecs/vd_mpng.c | 1 | ||||
-rw-r--r-- | libmpcodecs/vd_mtga.c | 1 | ||||
-rw-r--r-- | libmpcodecs/vd_realvid.c | 9 | ||||
-rw-r--r-- | libmpcodecs/vf_cropdetect.c | 1 |
7 files changed, 14 insertions, 19 deletions
diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index fd0511c99d..ae94bf097f 100644 --- a/libmpcodecs/ad_realaud.c +++ b/libmpcodecs/ad_realaud.c @@ -32,15 +32,15 @@ void *__builtin_new(unsigned long size) { void *__ctype_b=NULL; #endif -static unsigned long (*raCloseCodec)(unsigned long); -static unsigned long (*raDecode)(unsigned long,unsigned long,unsigned long,unsigned long,unsigned long,unsigned long); +static unsigned long (*raCloseCodec)(void*); +static unsigned long (*raDecode)(void*, char*,unsigned long,char*,unsigned long*,long); static unsigned long (*raFlush)(unsigned long,unsigned long,unsigned long); -static unsigned long (*raFreeDecoder)(unsigned long); -static unsigned long (*raGetFlavorProperty)(unsigned long,unsigned long,unsigned long,unsigned long); +static unsigned long (*raFreeDecoder)(void*); +static unsigned long (*raGetFlavorProperty)(void*,unsigned long,unsigned long,int*); //static unsigned long (*raGetNumberOfFlavors2)(void); -static unsigned long (*raInitDecoder)(unsigned long,unsigned long); -static unsigned long (*raOpenCodec2)(unsigned long); -static unsigned long (*raSetFlavor)(unsigned long,unsigned long); +static unsigned long (*raInitDecoder)(void*, void*); +static unsigned long (*raOpenCodec2)(void*); +static unsigned long (*raSetFlavor)(void*,unsigned long); //static void (*raSetDLLAccessPath)(unsigned long); static void (*raSetPwd)(char*,char*); @@ -59,7 +59,7 @@ static int preinit(sh_audio_t *sh){ // let's check if the driver is available, return 0 if not. // (you should do that if you use external lib(s) which is optional) unsigned int result; - int len; + int len=0; void* prop; char path[4096]; sprintf(path, REALCODEC_PATH "/%s", sh->codec->dll); @@ -97,8 +97,7 @@ static int preinit(sh_audio_t *sh){ sh->samplesize=sh->wf->wBitsPerSample/8; sh->channels=sh->wf->nChannels; - { unsigned char temp2[16]={1,0,0,3,4,0,0,0x14,0,0,0,0,0,1,0,3}; - // note: temp2[] come from audio stream extra header (last 16 of the total 24 bytes) + { ra_init_t init_data={ sh->wf->nSamplesPerSec,sh->wf->wBitsPerSample,sh->wf->nChannels, 100, // ??? diff --git a/libmpcodecs/dec_video.h b/libmpcodecs/dec_video.h index 53c728dd1d..cb3a088d63 100644 --- a/libmpcodecs/dec_video.h +++ b/libmpcodecs/dec_video.h @@ -13,6 +13,7 @@ extern int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,in extern int get_video_quality_max(sh_video_t *sh_video); extern void set_video_quality(sh_video_t *sh_video,int quality); +int get_video_colors(sh_video_t *sh_video,char *item,int *value); extern int set_video_colors(sh_video_t *sh_video,char *item,int value); extern int set_rectangle(sh_video_t *sh_video,int param,int value); diff --git a/libmpcodecs/vd_ijpg.c b/libmpcodecs/vd_ijpg.c index a7ab9d0368..e4c127a0da 100644 --- a/libmpcodecs/vd_ijpg.c +++ b/libmpcodecs/vd_ijpg.c @@ -63,7 +63,6 @@ METHODDEF(void) init_source (j_decompress_ptr cinfo) METHODDEF(boolean) fill_input_buffer (j_decompress_ptr cinfo) { my_src_ptr src = (my_src_ptr) cinfo->src; - size_t nbytes; src->pub.next_input_byte = src->inbuf; src->pub.bytes_in_buffer = src->bufsize; return TRUE; diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c index 99fa7fc5ad..da6a8bca68 100644 --- a/libmpcodecs/vd_mpng.c +++ b/libmpcodecs/vd_mpng.c @@ -66,7 +66,6 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ // png_bytep data; png_bytep * row_p; png_uint_32 png_width=0,png_height=0; - char * palette = NULL; int depth,color; png_uint_32 i; mp_image_t* mpi; diff --git a/libmpcodecs/vd_mtga.c b/libmpcodecs/vd_mtga.c index f94131ccb9..2ea3783475 100644 --- a/libmpcodecs/vd_mtga.c +++ b/libmpcodecs/vd_mtga.c @@ -62,7 +62,6 @@ static int last_c = -1; /* to set/get/query special features/parameters */ static int control(sh_video_t *sh, int cmd, void *arg, ...) { - TGAInfo *info = (TGAInfo *) sh->context; switch (cmd) { case VDCTRL_QUERY_FORMAT: diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index c3c91da61e..89b526f6e2 100644 --- a/libmpcodecs/vd_realvid.c +++ b/libmpcodecs/vd_realvid.c @@ -22,11 +22,11 @@ static vd_info_t info = { LIBVD_EXTERN(realvid) -unsigned long (*rvyuv_custom_message)(unsigned long,unsigned long); -unsigned long (*rvyuv_free)(unsigned long); +unsigned long (*rvyuv_custom_message)(unsigned long*,void*); +unsigned long (*rvyuv_free)(void*); unsigned long (*rvyuv_hive_message)(unsigned long,unsigned long); -unsigned long (*rvyuv_init)(unsigned long,unsigned long); -unsigned long (*rvyuv_transform)(unsigned long,unsigned long,unsigned long,unsigned long,unsigned long); +unsigned long (*rvyuv_init)(void*, void*); // initdata,context +unsigned long (*rvyuv_transform)(char*, char*,unsigned long*,unsigned long*,void*); void *rv_handle=NULL; @@ -65,7 +65,6 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ /* exits program when failure */ int load_syms_linux(char *path) { void *handle; - char *error; mp_msg(MSGT_DECVIDEO,MSGL_INFO, "opening shared obj '%s'\n", path); rv_handle = dlopen (path, RTLD_LAZY); diff --git a/libmpcodecs/vf_cropdetect.c b/libmpcodecs/vf_cropdetect.c index f8b63cf5ba..c8d4aae560 100644 --- a/libmpcodecs/vf_cropdetect.c +++ b/libmpcodecs/vf_cropdetect.c @@ -22,7 +22,6 @@ struct vf_priv_s { static int checkline(unsigned char* src,int stride,int len,int bpp){ int total=0; int div=len; - int x; switch(bpp){ case 1: while(--len>=0){ |