[FFmpeg-cvslog] vc1dec: use correct hybrid prediction threshold.

[shahriman AMS]

ffmpeg | branch: master | shahriman AMS <shahriman_ams at yahoo.com> | Tue Nov  8 08:47:32 2011 +0000| [4bceeaf0c1a2411f9fffd05f44e26c54abd26835] | committer: Anton Khirnov

vc1dec: use correct hybrid prediction threshold.

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4bceeaf0c1a2411f9fffd05f44e26c54abd26835
---

 libavcodec/vc1dec.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index f473b5d..8cd6980 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);