diff options
| author | wm4 <wm4@mplayer2.org> | 2012-02-24 15:25:22 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-02-24 15:25:22 +0100 |
| commit | 93d4dd46bf9c77bf097f26d52d0e1dfa913258c9 (patch) | |
| tree | 6961740418cdbdad235027f4151744ccca68ee11 /libmpcodecs | |
| parent | f684d12db1f547f4845dcee717359c4d6d5eed78 (diff) | |
| download | mpv-93d4dd46bf9c77bf097f26d52d0e1dfa913258c9.tar.bz2 mpv-93d4dd46bf9c77bf097f26d52d0e1dfa913258c9.tar.xz | |
mpcodecs: remove mp_image_t.x/y
These were never used.
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/mp_image.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/vf_vo.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h index dd69788f26..6dbe3bfe02 100644 --- a/libmpcodecs/mp_image.h +++ b/libmpcodecs/mp_image.h @@ -103,7 +103,7 @@ typedef struct mp_image { unsigned char bpp; // bits/pixel. NOT depth! for RGB it will be n*8 unsigned int imgfmt; int width,height; // stored dimensions - int x,y,w,h; // visible dimensions + int w,h; // visible dimensions unsigned char* planes[MP_MAX_PLANES]; int stride[MP_MAX_PLANES]; char * qscale; diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 5a96e07783..e6ce3e8ff3 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -358,11 +358,7 @@ int mpcodecs_config_vo2(sh_video_t *sh, int w, int h, mp_image_t *mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h) { - mp_image_t *mpi = - vf_get_image(sh->vfilter, sh->outfmt, mp_imgtype, mp_imgflag, w, h); - if (mpi) - mpi->x = mpi->y = 0; - return mpi; + return vf_get_image(sh->vfilter, sh->outfmt, mp_imgtype, mp_imgflag, w, h); } void mpcodecs_draw_slice(sh_video_t *sh, unsigned char **src, int *stride, diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index 9c0e90bb61..b7c16a7759 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -213,7 +213,7 @@ static int put_image(struct vf_instance *vf, // blit frame: // if(mpi->flags&MP_IMGFLAG_PLANAR) if(vf->default_caps&VFCAP_ACCEPT_STRIDE) - vo_draw_slice(video_out, mpi->planes,mpi->stride,mpi->w,mpi->h,mpi->x,mpi->y); + vo_draw_slice(video_out, mpi->planes,mpi->stride,mpi->w,mpi->h,0,0); else vo_draw_frame(video_out, mpi->planes); } |