1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

vc1dec: use correct hybrid prediction threshold.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
shahriman AMS
2011-11-08 08:47:32 +00:00
committed by Anton Khirnov
parent 4344ce08f1
commit 4bceeaf0c1

View 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) { 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) */ /* 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 = 32;
hybridmv_thresh = 16;
else
hybridmv_thresh = 32;
if (a_valid && c_valid) { if (a_valid && c_valid) {
if (is_intra[xy - wrap]) if (is_intra[xy - wrap])
sum = FFABS(px) + FFABS(py); sum = FFABS(px) + FFABS(py);