diff options
| author | James Zern <jzern@google.com> | 2013-12-13 12:41:31 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-13 12:41:31 -0800 |
| commit | 3aa75bcef6ee749afab39eaec8dfa6f0529eb032 (patch) | |
| tree | 852c2727140b1edc5c89542b62e3b94d8da3bbd8 /vp9/decoder | |
| parent | a793cf953f977c12cce44f73dea0a24330c65fbc (diff) | |
| parent | 178db94cd60d613f11b4f571399f238d7b5649e7 (diff) | |
| download | libvpx-3aa75bcef6ee749afab39eaec8dfa6f0529eb032.tar libvpx-3aa75bcef6ee749afab39eaec8dfa6f0529eb032.tar.gz libvpx-3aa75bcef6ee749afab39eaec8dfa6f0529eb032.tar.bz2 libvpx-3aa75bcef6ee749afab39eaec8dfa6f0529eb032.zip | |
Merge "vp9 asserts: fix compile warning"
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 4 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 7fc1dd248..daf89b497 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -266,7 +266,7 @@ static void inverse_transform_block(MACROBLOCKD* xd, int plane, int block, vp9_idct32x32_add(dqcoeff, dst, stride, eob); break; default: - assert(!"Invalid transform size"); + assert(0 && "Invalid transform size"); } if (eob == 1) { @@ -511,7 +511,7 @@ static void decode_modes_sb(VP9_COMMON *const cm, MACROBLOCKD *const xd, decode_modes_sb(cm, xd, tile, mi_row + hbs, mi_col + hbs, r, subsize); break; default: - assert(!"Invalid partition type"); + assert(0 && "Invalid partition type"); } } diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 9206c00a1..7d28344eb 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -308,7 +308,7 @@ static void read_ref_frames(VP9_COMMON *const cm, MACROBLOCKD *const xd, ref_frame[1] = NONE; } else { - assert(!"Invalid prediction mode."); + assert(0 && "Invalid prediction mode."); } } } |