diff options
| author |  michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-27 16:04:53 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-27 16:04:53 +0000 |
| commit | 20faf3dc0d48c4daf2f29322f961ed18b6d82ae4 (patch) | |
| tree | 06cf4c4f6cec1379c33f22f1b3dc06f55a70d66c /libmpcodecs | |
| parent | ba39e1594824d05ef32d6c7457b5c2250c7be250 (diff) | |
10000l (YUV vs. YVU swscale fix/cleanup)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9698 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_scale.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index 7539b90a6c..cb2c323ec6 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -166,9 +166,9 @@ static int config(struct vf_instance_s* vf, int_sws_flags|= vf->priv->v_chr_drop << SWS_SRC_V_CHR_DROP_SHIFT; int_sws_flags|= vf->priv->param << SWS_PARAM_SHIFT; vf->priv->ctx=sws_getContext(width,height, - (outfmt==IMGFMT_I420 || outfmt==IMGFMT_IYUV)?IMGFMT_YV12:outfmt, + outfmt, vf->priv->w,vf->priv->h, - (best==IMGFMT_I420 || best==IMGFMT_IYUV)?IMGFMT_YV12:best, + best, int_sws_flags, srcFilter, dstFilter); if(!vf->priv->ctx){ // error... @@ -229,7 +229,7 @@ static void draw_slice(struct vf_instance_s* vf, return; } // printf("vf_scale::draw_slice() y=%d h=%d\n",y,h); - sws_scale(vf->priv->ctx,src,stride,y,h,dmpi->planes,dmpi->stride); + sws_scale_ordered(vf->priv->ctx,src,stride,y,h,dmpi->planes,dmpi->stride); } static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ @@ -244,7 +244,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ dmpi=vf_get_image(vf->next,vf->priv->fmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE, vf->priv->w, vf->priv->h); - sws_scale(vf->priv->ctx,mpi->planes,mpi->stride,0,mpi->h,dmpi->planes,dmpi->stride); + sws_scale_ordered(vf->priv->ctx,mpi->planes,mpi->stride,0,mpi->h,dmpi->planes,dmpi->stride); } |