diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-01 14:30:55 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-01 14:30:55 +0000 |
| commit | d8edb8566cf577169d1d17de0665d8b0e097459d (patch) | |
| tree | dccbf1718e46124a822520ca7dd4a005d79c001a /libmpcodecs | |
| parent | b3ebd28168eed4245fda255a4e865c02fcbf465a (diff) | |
| download | mpv-d8edb8566cf577169d1d17de0665d8b0e097459d.tar.bz2 mpv-d8edb8566cf577169d1d17de0665d8b0e097459d.tar.xz | |
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7221 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -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 |
5 files changed, 5 insertions, 5 deletions
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); } |