Commit da464c48 authored by James Zern's avatar James Zern Committed by Gerrit Code Review

Merge "vp9 asserts: fix compile warning"

parents 0e00dbae 616b3a81
...@@ -1164,7 +1164,7 @@ static void encode_sb(VP9_COMP *cpi, ThreadData *td, ...@@ -1164,7 +1164,7 @@ static void encode_sb(VP9_COMP *cpi, ThreadData *td,
} }
break; break;
default: default:
assert("Invalid partition type."); assert(0 && "Invalid partition type.");
break; break;
} }
...@@ -1491,7 +1491,7 @@ static void encode_sb_rt(VP9_COMP *cpi, ThreadData *td, ...@@ -1491,7 +1491,7 @@ static void encode_sb_rt(VP9_COMP *cpi, ThreadData *td,
output_enabled, subsize, pc_tree->split[3]); output_enabled, subsize, pc_tree->split[3]);
break; break;
default: default:
assert("Invalid partition type."); assert(0 && "Invalid partition type.");
break; break;
} }
...@@ -3156,7 +3156,7 @@ static void nonrd_select_partition(VP9_COMP *cpi, ...@@ -3156,7 +3156,7 @@ static void nonrd_select_partition(VP9_COMP *cpi,
} }
break; break;
default: default:
assert("Invalid partition type."); assert(0 && "Invalid partition type.");
break; break;
} }
} }
...@@ -3291,7 +3291,7 @@ static void nonrd_use_partition(VP9_COMP *cpi, ...@@ -3291,7 +3291,7 @@ static void nonrd_use_partition(VP9_COMP *cpi,
} }
break; break;
default: default:
assert("Invalid partition type."); assert(0 && "Invalid partition type.");
break; break;
} }
......
...@@ -2142,7 +2142,7 @@ int vp9_full_pixel_search(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -2142,7 +2142,7 @@ int vp9_full_pixel_search(VP9_COMP *cpi, MACROBLOCK *x,
1, cost_list, fn_ptr, ref_mv, tmp_mv); 1, cost_list, fn_ptr, ref_mv, tmp_mv);
break; break;
default: default:
assert(!"Invalid search method."); assert(0 && "Invalid search method.");
} }
if (method != NSTEP && rd && var < var_max) if (method != NSTEP && rd && var < var_max)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment