Merge remote branch 'origin/master' into experimental

Change-Id: I6f77e7c10a54c54b26126b8acd5edd0a03358a41
2011-04-22 00:05:08 -04:00
parent b59bd22cc0 73c3d32705
commit 5dfd6f51cb
13 changed files with 138 additions and 248 deletions
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1381,7 +1381,7 @@ int vp8cx_encode_inter_macroblock
            cpi->MVcount[1][mv_max+((xd->block[0].bmi.mv.as_mv.col - best_ref_mv.col) >> 1)]++;
        }

-        if (!x->skip && !x->e_mbd.mode_info_context->mbmi.force_no_skip)
+        if (!x->skip)
        {
            vp8_encode_inter16x16(IF_RTCD(&cpi->rtcd), x);

@@ -1391,7 +1391,7 @@ int vp8cx_encode_inter_macroblock

        }
        else
-            vp8_stuff_inter16x16(x);
+            vp8_build_inter_predictors_mb_s(xd);
    }

    if (!x->skip)