Mercurial > mplayer.hg
changeset 7220:e3ecccc7e505
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
| author | arpi |
|---|---|
| date | Sun, 01 Sep 2002 14:30:55 +0000 |
| parents | 32e8afc0a057 |
| children | 32fcb4422cbb |
| files | cfgparser.h libmpcodecs/vd.c libmpcodecs/vd.h libmpcodecs/vd_ffmpeg.c libmpcodecs/vf.h libmpcodecs/vf_vo.c mencoder.c postproc/postprocess_template.c |
| diffstat | 8 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/cfgparser.h Sun Sep 01 11:46:38 2002 +0000 +++ b/cfgparser.h Sun Sep 01 14:30:55 2002 +0000 @@ -74,7 +74,7 @@ int as_int; float as_float; void* as_pointer; - off_t* as_off_t; + off_t as_off_t; } param; char* opt_name; };
--- a/libmpcodecs/vd.c Sun Sep 01 11:46:38 2002 +0000 +++ b/libmpcodecs/vd.c Sun Sep 01 14:30:55 2002 +0000 @@ -278,7 +278,7 @@ 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)
--- a/libmpcodecs/vd.h Sun Sep 01 11:46:38 2002 +0000 +++ b/libmpcodecs/vd.h Sun Sep 01 14:30:55 2002 +0000 @@ -26,6 +26,6 @@ // 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
--- a/libmpcodecs/vd_ffmpeg.c Sun Sep 01 11:46:38 2002 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Sun Sep 01 14:30:55 2002 +0000 @@ -257,7 +257,7 @@ } }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){
--- a/libmpcodecs/vf.h Sun Sep 01 11:46:38 2002 +0000 +++ b/libmpcodecs/vf.h Sun Sep 01 14:30:55 2002 +0000 @@ -32,7 +32,7 @@ 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()
--- a/libmpcodecs/vf_vo.c Sun Sep 01 11:46:38 2002 +0000 +++ b/libmpcodecs/vf_vo.c Sun Sep 01 14:30:55 2002 +0000 @@ -103,7 +103,7 @@ } 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); }
--- a/mencoder.c Sun Sep 01 11:46:38 2002 +0000 +++ b/mencoder.c Sun Sep 01 14:30:55 2002 +0000 @@ -528,7 +528,7 @@ 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];
--- a/postproc/postprocess_template.c Sun Sep 01 11:46:38 2002 +0000 +++ b/postproc/postprocess_template.c Sun Sep 01 14:30:55 2002 +0000 @@ -2449,6 +2449,8 @@ * 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) {