commit 0adb805db954834d9d71c3cf6f026bbd74776527
author Sarah Parker <sarahparker@google.com> Fri Mar 18 21:29:24 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 18 21:29:24 2016 +0000
tree 3398bbdb304d60d8752db08ee796a274e4422ffa
parent 42e5c2ad8abfb6ac2616e0011b380f1359788ff2
parent fab5454a16ca46b1e14caecbf804d99ed9df8ce1

Merge "Remove prune three from speed features" into nextgenv2

vp10/encoder/bitstream.c

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index f20c224..a305c42 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -1457,7 +1457,7 @@
       assert(*tok < tok_end);
       pack_palette_tokens(w, tok, m->mbmi.palette_mode_info.palette_size[plane],
                           rows * cols - 1);
-      assert(*tok < tok_end);
+      assert(*tok < tok_end + m->mbmi.skip);
     }
   }
 

vp10/encoder/rdopt.c

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index ebce150..467fe98 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -8272,7 +8272,7 @@
 
         rd_cost->rate = rate2;
 #if CONFIG_SUPERTX
-        if (x->skip && rate_y == INT_MAX)
+        if (x->skip)
           *returnrate_nocoef = rate2;
         else
           *returnrate_nocoef = rate2 - rate_y - rate_uv;