]> granicus.if.org Git - libvpx/commitdiff
Fix 2 warning when building with GCC 5.
authorGeza Lore <gezalore@gmail.com>
Wed, 13 Apr 2016 09:45:16 +0000 (10:45 +0100)
committerGeza Lore <gezalore@gmail.com>
Wed, 13 Apr 2016 09:49:52 +0000 (10:49 +0100)
These caused the following warning with GCC 5:
     warning: logical not is only applied to the left hand side of
     comparison [-Wlogical-not-parentheses]
     assert(!is_compound == (cm->reference_mode == SINGLE_REFERENCE));

Change-Id: If296aabb2311ceb7d903b395c1549ef81c2cbf9b

vp10/encoder/bitstream.c
vp9/encoder/vp9_bitstream.c

index 7f3b6a2d668b9f9cb68df9966a0016208f217dca..19e7a7ff268c7605ef166b5bad93bd213a264e2a 100644 (file)
@@ -833,7 +833,7 @@ static void write_ref_frames(const VP10_COMMON *cm, const MACROBLOCKD *xd,
     if (cm->reference_mode == REFERENCE_MODE_SELECT) {
       vp10_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) {
index 5600ed4585105f545de9e83aa0bb49204adb545c..9f8004b6ffe8d1b553336170ed18a2dacbf71ed5 100644 (file)
@@ -210,7 +210,7 @@ static void write_ref_frames(const VP9_COMMON *cm, const MACROBLOCKD *xd,
     if (cm->reference_mode == REFERENCE_MODE_SELECT) {
       vpx_write(w, is_compound, vp9_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) {