diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:06:42 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:06:42 +0200 |
| commit | 17eb7f2c4bb070d9477792fcbd4a5120ee1a789c (patch) | |
| tree | 702cfe702169effb14fbabb3f50d289c1683147d /libmpcodecs | |
| parent | ff3ef4e7827424db7444cdb7973faa499e054ac5 (diff) | |
| parent | eb6fc7e99e07712b74c17c917aa33704ef6e410a (diff) | |
| download | mpv-17eb7f2c4bb070d9477792fcbd4a5120ee1a789c.tar.bz2 mpv-17eb7f2c4bb070d9477792fcbd4a5120ee1a789c.tar.xz | |
Merge svn changes up to r30195
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_scale.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/vf_screenshot.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index 246624ae3a..a38cf895d9 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -347,14 +347,14 @@ static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src int src_stride2[MP_MAX_PLANES]={2*src_stride[0], 2*src_stride[1], 2*src_stride[2], 2*src_stride[3]}; int dst_stride2[MP_MAX_PLANES]={2*dst_stride[0], 2*dst_stride[1], 2*dst_stride[2], 2*dst_stride[3]}; - sws_scale_ordered(sws1, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2); + sws_scale(sws1, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2); for(i=0; i<MP_MAX_PLANES; i++){ src2[i] += src_stride[i]; dst2[i] += dst_stride[i]; } - sws_scale_ordered(sws2, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2); + sws_scale(sws2, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2); }else{ - sws_scale_ordered(sws1, src2, src_stride, y, h, dst, dst_stride); + sws_scale(sws1, src2, src_stride, y, h, dst, dst_stride); } } diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c index 0176eddfbd..717f075bb4 100644 --- a/libmpcodecs/vf_screenshot.c +++ b/libmpcodecs/vf_screenshot.c @@ -116,7 +116,7 @@ static void scale_image(struct vf_priv_s* priv, mp_image_t *mpi) priv->buffer = memalign(16, dst_stride[0]*priv->dh); dst[0] = priv->buffer; - sws_scale_ordered(priv->ctx, mpi->planes, mpi->stride, 0, priv->dh, dst, dst_stride); + sws_scale(priv->ctx, mpi->planes, mpi->stride, 0, priv->dh, dst, dst_stride); } static void start_slice(struct vf_instance* vf, mp_image_t *mpi) @@ -139,7 +139,7 @@ static void draw_slice(struct vf_instance* vf, unsigned char** src, int dst_stride[MP_MAX_PLANES] = {0}; dst_stride[0] = vf->priv->stride; dst[0] = vf->priv->buffer; - sws_scale_ordered(vf->priv->ctx, src, stride, y, h, dst, dst_stride); + sws_scale(vf->priv->ctx, src, stride, y, h, dst, dst_stride); } vf_next_draw_slice(vf,src,stride,w,h,x,y); } |