From eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf Mon Sep 17 00:00:00 2001 From: Mashiat Sarker Shakkhar Date: Tue, 9 Oct 2012 19:38:18 +0000 Subject: vc1dec: Set opposite to the correct value for 1REF field pictures Signed-off-by: Derek Buitenhuis --- libavcodec/vc1dec.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 491e200a52..40164cc9db 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1458,10 +1458,16 @@ static inline void vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, } if (v->field_mode) { - if (num_samefield <= num_oppfield) - opposite = 1 - pred_flag; - else - opposite = pred_flag; + if (!v->numref) + // REFFIELD determines if the last field or the second-last field is + // to be used as reference + opposite = 1 - v->reffield; + else { + if (num_samefield <= num_oppfield) + opposite = 1 - pred_flag; + else + opposite = pred_flag; + } } else opposite = 0; if (opposite) { -- cgit v1.2.3