From 4bceeaf0c1a2411f9fffd05f44e26c54abd26835 Mon Sep 17 00:00:00 2001 From: shahriman AMS Date: Tue, 8 Nov 2011 08:47:32 +0000 Subject: [PATCH] vc1dec: use correct hybrid prediction threshold. Signed-off-by: Anton Khirnov --- libavcodec/vc1dec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index f473b5d016..8cd6980779 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -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);