vc1dec: Set opposite to the correct value for 1REF field pictures

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
13 years ago · eb657ecefd
parent 7cc3c4e1d4
commit eb657ecefd
1 changed files with 10 additions and 4 deletions
--- 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) {