commit c7576f97ff58508411e4db08df1d8a4dcc6b2b68
author Adrian Grange <agrange@google.com> Mon Jan 14 14:18:21 2013 -0800
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Mon Jan 14 14:18:21 2013 -0800
tree 0be20d4f2bf60aae5b7d8838a17dcf3eb63cd456
parent 290b83ab627365ac697b477a8d0cfa8cbf6b90db
parent 7bcaac3e64c38de7112e6c05e3e7f19198cb9ae4

Merge "Merge prediction filter" into experimental

vp9/encoder/vp9_rdopt.c

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index a82670b..b730958 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3765,8 +3765,6 @@
 
   *returnintra = LLONG_MAX;
 
-  x->skip = 0;
-
   mbmi->ref_frame = INTRA_FRAME;
 
   /* Initialize zbin mode boost for uv costing */
@@ -3809,6 +3807,8 @@
     rate_y = 0;
     rate_uv = 0;
 
+    x->skip = 0;
+
     this_mode = vp9_mode_order[mode_index].mode;
     mbmi->mode = this_mode;
     mbmi->uv_mode = DC_PRED;