commit 42e5c2ad8abfb6ac2616e0011b380f1359788ff2
author Yaowu Xu <yaowu@google.com> Fri Mar 18 11:38:56 2016 -0700
committer Yaowu Xu <yaowu@google.com> Fri Mar 18 11:48:19 2016 -0700
tree faa0d5ad4c929e9d7987b566d13bc364e6aa94b1
parent cb61bfa695b3700df0a02de54364ae96fb663b78

Two minor logic fixes

Change-Id: I1d5624fb2f34f87a55613036851034ec7c2d0b76

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 01b5abb..647d571 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -8286,7 +8286,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;