diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-01 21:24:16 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-02 08:38:09 +0200 |
| commit | 3379531c401b457c9f7437ee0db772da75fd1765 (patch) | |
| tree | fe0ec300b6c0940362c7bd06ddd2ecb3bfd30a43 /libavfilter/libmpcodecs/vf_smartblur.c | |
| parent | 2a30df09fd64634ad1b70485cd665ad05116730c (diff) | |
Port recent changes to MPlayer libmpcodecs.
Also include an older fix for vf_smartblur which was essentially
broken due to reading the threshold value wrongly.
Diffstat (limited to 'libavfilter/libmpcodecs/vf_smartblur.c')
| -rw-r--r-- | libavfilter/libmpcodecs/vf_smartblur.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/libmpcodecs/vf_smartblur.c b/libavfilter/libmpcodecs/vf_smartblur.c index 3e20880f04..8acdb73ffc 100644 --- a/libavfilter/libmpcodecs/vf_smartblur.c +++ b/libavfilter/libmpcodecs/vf_smartblur.c @@ -183,11 +183,11 @@ static inline void blur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; - FilterParam *f= &vf->priv; + int threshold = vf->priv->luma.threshold || vf->priv->chroma.threshold; mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE| - (f->threshold) ? MP_IMGFLAG_READABLE : 0, + (threshold ? MP_IMGFLAG_READABLE : 0), mpi->w,mpi->h); assert(mpi->flags&MP_IMGFLAG_PLANAR); |