diff options
| -rw-r--r-- | cfgparser.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf_vo.c | 2 | ||||
| -rw-r--r-- | mencoder.c | 2 | ||||
| -rw-r--r-- | postproc/postprocess_template.c | 2 |
8 files changed, 9 insertions, 7 deletions
diff --git a/cfgparser.h b/cfgparser.h index f860a3cd52..c2deb3af2e 100644 --- a/cfgparser.h +++ b/cfgparser.h @@ -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; }; diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 906ec42f9d..34ceeb0d8d 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -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) diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h index 569cc8759e..0d4348c6d8 100644 --- a/libmpcodecs/vd.h +++ b/libmpcodecs/vd.h @@ -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 diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 3865529975..896b8e6f29 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -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){ diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h index 288da73c3f..f7b86f1a1c 100644 --- a/libmpcodecs/vf.h +++ b/libmpcodecs/vf.h @@ -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() diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index e78f973e0b..da9ef883d8 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -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); } diff --git a/mencoder.c b/mencoder.c index fddbb26bae..3024ef0e00 100644 --- a/mencoder.c +++ b/mencoder.c @@ -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]; diff --git a/postproc/postprocess_template.c b/postproc/postprocess_template.c index 4e5bd166d5..dbb6dd5f42 100644 --- a/postproc/postprocess_template.c +++ b/postproc/postprocess_template.c @@ -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) { |