shithub: libvpx

Download patch

ref: da464c483f99ad1c97e4fd4a79579ab4b802ed6b
parent: 0e00dbae0273d501bf01a48b246c2c5baf1f7f18
parent: 616b3a810fc96da35c9676a453346743412956db
author: James Zern <jzern@google.com>
date: Fri Dec 5 16:09:42 EST 2014 

Merge "vp9 asserts: fix compile warning"


--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1164,7 +1164,7 @@
       }
       break;
     default:
-      assert("Invalid partition type.");
+      assert(0 && "Invalid partition type.");
       break;
   }
 
@@ -1491,7 +1491,7 @@
                    output_enabled, subsize, pc_tree->split[3]);
       break;
     default:
-      assert("Invalid partition type.");
+      assert(0 && "Invalid partition type.");
       break;
   }
 
@@ -3156,7 +3156,7 @@
         }
         break;
       default:
-        assert("Invalid partition type.");
+        assert(0 && "Invalid partition type.");
         break;
     }
   }
@@ -3291,7 +3291,7 @@
       }
       break;
     default:
-      assert("Invalid partition type.");
+      assert(0 && "Invalid partition type.");
       break;
   }
 
--- a/vp9/encoder/vp9_mcomp.c
+++ b/vp9/encoder/vp9_mcomp.c
@@ -2142,7 +2142,7 @@
                                    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)