commit 1623f635dc898400687a9c327213ae9b84dbcb6f
author Yaowu Xu <yaowu@google.com> Wed Jan 27 00:02:12 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 27 00:02:12 2016 +0000
tree 3d0bc57d1cd58288fd8278cb5d0ef1c5116bcf5e
parent 51d3121f96dff3016ff0b94def2a8f8bc26ce47d
parent 7dd8b4c3ac373e8d8eab18d88196bfa9c6d0c5f8

Merge "Correct comments that refer to VP9."

test/y4m_test.cc

diff --git a/test/y4m_test.cc b/test/y4m_test.cc
index a555329..91b30b1 100644
--- a/test/y4m_test.cc
+++ b/test/y4m_test.cc
@@ -140,7 +140,7 @@
 class Y4mVideoWriteTest
     : public Y4mVideoSourceTest {
  protected:
-  Y4mVideoWriteTest() {}
+  Y4mVideoWriteTest() : tmpfile_(NULL) {}
 
   virtual ~Y4mVideoWriteTest() {
     delete tmpfile_;

vp10/encoder/bitstream.c

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index 5bf9f98..0b2645849 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -312,7 +312,7 @@
     if (cm->reference_mode == REFERENCE_MODE_SELECT) {
       vpx_write(w, is_compound, vp10_get_reference_mode_prob(cm, xd));
     } else {
-      assert(!is_compound == (cm->reference_mode == SINGLE_REFERENCE));
+      assert((!is_compound) == (cm->reference_mode == SINGLE_REFERENCE));
     }
 
     if (is_compound) {