[MPlayer-cvslog] r33398 - trunk/libmpcodecs/vf_smartblur.c

[cboesch]

Author: cboesch
Date: Sat May  7 18:29:57 2011
New Revision: 33398

Log:
vf_smartblur: fix threshold condition.

The threshold condition was broken (spotted because of a bad cast warning) and
should now be fixed and using both luma and chroma threshold. The patch also
fixes setting MP_IMGFLAG_READABLE (priorities fixed with the brackets) in the
vf_get_image call.

Modified:
   trunk/libmpcodecs/vf_smartblur.c

Modified: trunk/libmpcodecs/vf_smartblur.c
==============================================================================
--- trunk/libmpcodecs/vf_smartblur.c	Sat May  7 18:16:23 2011	(r33397)
+++ trunk/libmpcodecs/vf_smartblur.c	Sat May  7 18:29:57 2011	(r33398)
@@ -183,11 +183,11 @@ static inline void blur(uint8_t *dst, ui
 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);