Merge commit '28d82b76'

* commit '28d82b76':
  vc1dec: refactor check with missing parenthesis

Conflicts:
	libavcodec/vc1_mc.c
	tests/ref/fate/vc1_ilaced_twomv

Theres no change to the reference checksums as this bug was not
in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/vc1_mc.c

@@ -802,12 +802,10 @@ void ff_vc1_interp_mc(VC1Context *v)
     my   = s->mv[1][0][1];
     uvmx = (mx + ((mx & 3) == 3)) >> 1;
     uvmy = (my + ((my & 3) == 3)) >> 1;
-    if (v->field_mode) {
-        if (v->cur_field_type != v->ref_field_type[1]) {
+    if (v->field_mode && v->cur_field_type != v->ref_field_type[1]) {
         my   = my   - 2 + 4 * v->cur_field_type;
         uvmy = uvmy - 2 + 4 * v->cur_field_type;
     }
-    }
     if (v->fastuvmc) {
         uvmx = uvmx + ((uvmx < 0) ? -(uvmx & 1) : (uvmx & 1));
         uvmy = uvmy + ((uvmy < 0) ? -(uvmy & 1) : (uvmy & 1));