h264: move intra4x4_pred_mode[_cache] into the per-slice context

[ffmpeg] / libavcodec / vc1_mc.c

diff --git a/libavcodec/vc1_mc.c b/libavcodec/vc1_mc.c
index 00a003ce8c640bb4ac548c468b381303cf0166a4..e3a75d584556ffb84fc3e2ac05ab18a654a95aa3 100644 (file)
--- a/libavcodec/vc1_mc.c
+++ b/libavcodec/vc1_mc.c
@@ -796,10 +796,9 @@ 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])
-            my   = my   - 2 + 4 * v->cur_field_type;
-            uvmy = uvmy - 2 + 4 * v->cur_field_type;
+    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));