# HG changeset patch # User iive # Date 1121822544 0 # Node ID bdf1b4ecb90642e53755b6c2ca47c301ff552367 # Parent 41ca23f65baa15547c4aea830b273119091ac0e8 use stored dimensions instead of visible one when (vf_)get_image is called let's see where does the cola goes :) diff -r 41ca23f65baa -r bdf1b4ecb906 libmpcodecs/vf_fspp.c --- a/libmpcodecs/vf_fspp.c Tue Jul 19 22:03:15 2005 +0000 +++ b/libmpcodecs/vf_fspp.c Wed Jul 20 01:22:24 2005 +0000 @@ -507,7 +507,7 @@ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, - mpi->type, mpi->flags, mpi->w, mpi->h); + mpi->type, mpi->flags, mpi->width, mpi->height); mpi->planes[0]=vf->dmpi->planes[0]; mpi->stride[0]=vf->dmpi->stride[0]; mpi->width=vf->dmpi->width; @@ -528,7 +528,7 @@ dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, - mpi->w,mpi->h); + mpi->width,mpi->height); vf_clone_mpi_attributes(dmpi, mpi); }else{ dmpi=vf->dmpi; diff -r 41ca23f65baa -r bdf1b4ecb906 libmpcodecs/vf_pp.c --- a/libmpcodecs/vf_pp.c Tue Jul 19 22:03:15 2005 +0000 +++ b/libmpcodecs/vf_pp.c Wed Jul 20 01:22:24 2005 +0000 @@ -97,7 +97,7 @@ return; // colorspace differ // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, - mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->w, mpi->h); + mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->width, mpi->height); mpi->planes[0]=vf->dmpi->planes[0]; mpi->stride[0]=vf->dmpi->stride[0]; mpi->width=vf->dmpi->width; @@ -117,7 +117,7 @@ MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, // MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, // mpi->w,mpi->h); - (mpi->w+7)&(~7),(mpi->h+7)&(~7)); + (mpi->width+7)&(~7),(mpi->height+7)&(~7)); vf->dmpi->w=mpi->w; vf->dmpi->h=mpi->h; // display w;h } diff -r 41ca23f65baa -r bdf1b4ecb906 libmpcodecs/vf_pp7.c --- a/libmpcodecs/vf_pp7.c Tue Jul 19 22:03:15 2005 +0000 +++ b/libmpcodecs/vf_pp7.c Wed Jul 20 01:22:24 2005 +0000 @@ -356,7 +356,7 @@ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, - mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->w, mpi->h); + mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->width, mpi->height); mpi->planes[0]=vf->dmpi->planes[0]; mpi->stride[0]=vf->dmpi->stride[0]; mpi->width=vf->dmpi->width; @@ -379,7 +379,7 @@ dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, - mpi->w,mpi->h); + mpi->width,mpi->height); vf_clone_mpi_attributes(dmpi, mpi); } diff -r 41ca23f65baa -r bdf1b4ecb906 libmpcodecs/vf_spp.c --- a/libmpcodecs/vf_spp.c Tue Jul 19 22:03:15 2005 +0000 +++ b/libmpcodecs/vf_spp.c Wed Jul 20 01:22:24 2005 +0000 @@ -453,7 +453,7 @@ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, - mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->w, mpi->h); + mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->width, mpi->height); mpi->planes[0]=vf->dmpi->planes[0]; mpi->stride[0]=vf->dmpi->stride[0]; mpi->width=vf->dmpi->width; @@ -474,7 +474,7 @@ dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, - mpi->w,mpi->h); + mpi->width,mpi->height); vf_clone_mpi_attributes(dmpi, mpi); }else{ dmpi=vf->dmpi;