diff options
| author | James Zern <jzern@google.com> | 2014-12-05 21:09:42 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-05 21:09:42 -0800 |
| commit | da464c483f99ad1c97e4fd4a79579ab4b802ed6b (patch) | |
| tree | c7d18e280e2e819e7dc0f9fd2a783da10fe0408a | |
| parent | 0e00dbae0273d501bf01a48b246c2c5baf1f7f18 (diff) | |
| parent | 616b3a810fc96da35c9676a453346743412956db (diff) | |
| download | libvpx-da464c483f99ad1c97e4fd4a79579ab4b802ed6b.tar libvpx-da464c483f99ad1c97e4fd4a79579ab4b802ed6b.tar.gz libvpx-da464c483f99ad1c97e4fd4a79579ab4b802ed6b.tar.bz2 libvpx-da464c483f99ad1c97e4fd4a79579ab4b802ed6b.zip | |
Merge "vp9 asserts: fix compile warning"
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 8 | ||||
| -rw-r--r-- | 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 db182350d..5e6e77dc9 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 7f4d0c7af..a428f1a2d 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) |