vc1dec: use correct hybrid prediction threshold.
authorshahriman AMS <shahriman_ams@yahoo.com>
Tue, 8 Nov 2011 08:47:32 +0000 (08:47 +0000)
committerAnton Khirnov <anton@khirnov.net>
Wed, 9 Nov 2011 09:53:24 +0000 (10:53 +0100)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/vc1dec.c

index f473b5d..8cd6980 100644 (file)
@@ -1660,10 +1660,7 @@ static inline void vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y,
 
     if (!v->field_mode || s->pict_type != AV_PICTURE_TYPE_B) {
         /* Calculate hybrid prediction as specified in 8.3.5.3.5 (also 10.3.5.4.3.5) */
-        if (v->field_mode && !s->quarter_sample)
-            hybridmv_thresh = 16;
-        else
-            hybridmv_thresh = 32;
+        hybridmv_thresh = 32;
         if (a_valid && c_valid) {
             if (is_intra[xy - wrap])
                 sum = FFABS(px) + FFABS(py);