mirror of
https://github.com/mpv-player/mpv.git
synced 2026-10-29 07:06:59 +08:00
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
This commit is contained in:
@@ -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, // ???
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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){
|
||||
|
||||
Reference in New Issue
Block a user