diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-24 12:01:53 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-24 12:01:53 +0000 |
| commit | 310d9a47c1c17e5894df006a434ca8f778e8a50e (patch) | |
| tree | 527bf2d94343b82ed277013698c1a41857cb2b5e /libmpcodecs | |
| parent | 48bd8da2d62fc9d3ec63254619a4a7182b9a47fa (diff) | |
| download | mpv-310d9a47c1c17e5894df006a434ca8f778e8a50e.tar.bz2 mpv-310d9a47c1c17e5894df006a434ca8f778e8a50e.tar.xz | |
Fix memory corruption, noticable at reallocate image
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12632 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_spp.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c index 95c633b705..c0f1b1c66e 100644 --- a/libmpcodecs/vf_spp.c +++ b/libmpcodecs/vf_spp.c @@ -472,13 +472,15 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // no DR, so get a new image! hope we'll get DR buffer: - vf->dmpi=vf_get_image(vf->next,vf->priv->outfmt, - MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, - mpi->w,mpi->h); - } + dmpi=vf_get_image(vf->next,vf->priv->outfmt, + MP_IMGTYPE_TEMP, + MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, + mpi->w,mpi->h); + vf_clone_mpi_attributes(dmpi, mpi); + }else{ + dmpi=mpi; + } - dmpi= vf->dmpi; - vf->priv->mpeg2= mpi->qscale_type; if(vf->priv->log2_count || !(mpi->flags&MP_IMGFLAG_DIRECT)){ if(mpi->qscale || vf->priv->qp){ @@ -491,7 +493,6 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[2], mpi->stride[2]); } } - vf_clone_mpi_attributes(dmpi, mpi); #ifdef HAVE_MMX if(gCpuCaps.hasMMX) asm volatile ("emms\n\t"); @@ -566,7 +567,7 @@ static int control(struct vf_instance_s* vf, int request, void* data){ static int open(vf_instance_t *vf, char* args){ - int log2c; + int log2c=0; vf->config=config; vf->put_image=put_image; |