mirror of https://github.com/mpv-player/mpv
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:
parent
b3ebd28168
commit
d8edb8566c
|
@ -74,7 +74,7 @@ struct config_save {
|
||||||
int as_int;
|
int as_int;
|
||||||
float as_float;
|
float as_float;
|
||||||
void* as_pointer;
|
void* as_pointer;
|
||||||
off_t* as_off_t;
|
off_t as_off_t;
|
||||||
} param;
|
} param;
|
||||||
char* opt_name;
|
char* opt_name;
|
||||||
};
|
};
|
||||||
|
|
|
@ -278,7 +278,7 @@ mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, i
|
||||||
return mpi;
|
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;
|
struct vf_instance_s* vf = sh->vfilter;
|
||||||
|
|
||||||
if(vf->draw_slice)
|
if(vf->draw_slice)
|
||||||
|
|
|
@ -26,6 +26,6 @@ extern int vd_use_slices;
|
||||||
// callbacks:
|
// callbacks:
|
||||||
int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt);
|
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);
|
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
|
#define VDFLAGS_DROPFRAME 3
|
||||||
|
|
|
@ -257,7 +257,7 @@ static void draw_slice(struct AVCodecContext *s,
|
||||||
}
|
}
|
||||||
}else
|
}else
|
||||||
#endif
|
#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){
|
static int init_vo(sh_video_t *sh){
|
||||||
|
|
|
@ -32,7 +32,7 @@ typedef struct vf_instance_s {
|
||||||
void (*put_image)(struct vf_instance_s* vf,
|
void (*put_image)(struct vf_instance_s* vf,
|
||||||
mp_image_t *mpi);
|
mp_image_t *mpi);
|
||||||
void (*draw_slice)(struct vf_instance_s* vf,
|
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);
|
void (*uninit)(struct vf_instance_s* vf);
|
||||||
// caps:
|
// caps:
|
||||||
unsigned int default_caps; // used by default query_format()
|
unsigned int default_caps; // used by default query_format()
|
||||||
|
|
|
@ -103,7 +103,7 @@ static void put_image(struct vf_instance_s* vf,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void draw_slice(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?
|
if(!vo_config_count) return; // vo not configured?
|
||||||
video_out->draw_slice(src,stride,w,h,x,y);
|
video_out->draw_slice(src,stride,w,h,x,y);
|
||||||
}
|
}
|
||||||
|
|
|
@ -528,7 +528,7 @@ if (vobsub_out) {
|
||||||
unsigned char tmp[3] = { 0, 0, 0 };
|
unsigned char tmp[3] = { 0, 0, 0 };
|
||||||
if (spudec_ifo && vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, dvdsub_id, tmp) >= 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_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
|
#ifdef USE_DVDREAD
|
||||||
if (vobsub_writer == NULL) {
|
if (vobsub_writer == NULL) {
|
||||||
char tmp[3];
|
char tmp[3];
|
||||||
|
|
|
@ -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
|
* Copies a block from src to dst and fixes the blacklevel
|
||||||
* levelFix == 0 -> dont touch the brighness & contrast
|
* 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,
|
static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, uint8_t src[], int srcStride,
|
||||||
int levelFix)
|
int levelFix)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue