RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org> 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7221 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-09-01 14:30:55 +00:00
parent b3ebd28168
commit d8edb8566c
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cfgparser.h
View File

@ -74,7 +74,7 @@ struct config_save {
int as_int;
float as_float;
void* as_pointer;
off_t* as_off_t;
off_t as_off_t;
} param;
char* opt_name;
};

2
libmpcodecs/vd.c
View File

@ -278,7 +278,7 @@ mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, i
return mpi;
}
void mpcodecs_draw_slice(sh_video_t *sh, unsigned char* src, int* stride, int w,int h, int x, int y) {
void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y) {
struct vf_instance_s* vf = sh->vfilter;
if(vf->draw_slice)

2
libmpcodecs/vd.h
View File

@ -26,6 +26,6 @@ extern int vd_use_slices;
// callbacks:
int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt);
mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h);
void mpcodecs_draw_slice(sh_video_t *sh, unsigned char* src, int* stride, int w,int h, int x, int y);
void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y);
#define VDFLAGS_DROPFRAME 3

2
libmpcodecs/vd_ffmpeg.c
View File

@ -257,7 +257,7 @@ static void draw_slice(struct AVCodecContext *s,
}
}else
#endif
mpcodecs_draw_slice (sh,(unsigned char*)src, stride, width, height, 0, y);
mpcodecs_draw_slice (sh,src, stride, width, height, 0, y);
}
static int init_vo(sh_video_t *sh){

2
libmpcodecs/vf.h
View File

@ -32,7 +32,7 @@ typedef struct vf_instance_s {
void (*put_image)(struct vf_instance_s* vf,
mp_image_t *mpi);
void (*draw_slice)(struct vf_instance_s* vf,
unsigned char* src, int* stride, int w,int h, int x, int y);
unsigned char** src, int* stride, int w,int h, int x, int y);
void (*uninit)(struct vf_instance_s* vf);
// caps:
unsigned int default_caps; // used by default query_format()

2
libmpcodecs/vf_vo.c
View File

@ -103,7 +103,7 @@ static void put_image(struct vf_instance_s* vf,
}
static void draw_slice(struct vf_instance_s* vf,
unsigned char* src, int* stride, int w,int h, int x, int y){
unsigned char** src, int* stride, int w,int h, int x, int y){
if(!vo_config_count) return; // vo not configured?
video_out->draw_slice(src,stride,w,h,x,y);
}

2
mencoder.c
View File

@ -528,7 +528,7 @@ if (vobsub_out) {
unsigned char tmp[3] = { 0, 0, 0 };
if (spudec_ifo && vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, dvdsub_id, tmp) >= 0)
vobsub_writer = vobsub_out_open(vobsub_out, palette, sh_video->disp_w, sh_video->disp_h,
vobsub_out_id?vobsub_out_id:tmp, vobsub_out_index);
vobsub_out_id?vobsub_out_id:(char *)tmp, vobsub_out_index);
#ifdef USE_DVDREAD
if (vobsub_writer == NULL) {
char tmp[3];

2
postproc/postprocess_template.c
View File

@ -2449,6 +2449,8 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
* Copies a block from src to dst and fixes the blacklevel
* levelFix == 0 -> dont touch the brighness & contrast
*/
#undef SCALED_CPY
static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, uint8_t src[], int srcStride,
int levelFix)
{