Merge "vp9 asserts: fix compile warning"

vp9/encoder/vp9_encodeframe.c

@@ -1164,7 +1164,7 @@ static void encode_sb(VP9_COMP *cpi, ThreadData *td,
       }
       break;
     default:
-      assert("Invalid partition type.");
+      assert(0 && "Invalid partition type.");
       break;
   }
 
@@ -1491,7 +1491,7 @@ static void encode_sb_rt(VP9_COMP *cpi, ThreadData *td,
                    output_enabled, subsize, pc_tree->split[3]);
       break;
     default:
-      assert("Invalid partition type.");
+      assert(0 && "Invalid partition type.");
       break;
   }
 
@@ -3156,7 +3156,7 @@ static void nonrd_select_partition(VP9_COMP *cpi,
         }
         break;
       default:
-        assert("Invalid partition type.");
+        assert(0 && "Invalid partition type.");
         break;
     }
   }
@@ -3291,7 +3291,7 @@ static void nonrd_use_partition(VP9_COMP *cpi,
       }
       break;
     default:
-      assert("Invalid partition type.");
+      assert(0 && "Invalid partition type.");
       break;
   }
 

vp9/encoder/vp9_mcomp.c

@@ -2142,7 +2142,7 @@ int vp9_full_pixel_search(VP9_COMP *cpi, MACROBLOCK *x,
                                    1, cost_list, fn_ptr, ref_mv, tmp_mv);
       break;
     default:
-      assert(!"Invalid search method.");
+      assert(0 && "Invalid search method.");
   }
 
   if (method != NSTEP && rd && var < var_max)