From 616b3a810fc96da35c9676a453346743412956db Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 5 Dec 2014 16:20:42 -0800 Subject: [PATCH] vp9 asserts: fix compile warning string literal to int within an assert Change-Id: I76a173f96b9add5bf27c3f5ad5d72c6f30e51629 --- vp9/encoder/vp9_encodeframe.c | 8 ++++---- vp9/encoder/vp9_mcomp.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index db18235..5e6e77d 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/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; } diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index 7f4d0c7..a428f1a 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/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) -- 2.7.4