commit 1d1df182eec7b33d1041f34745cbd5a0d3263215
author Ryan Lei <ryan.z.lei@intel.com> Thu Jun 15 11:38:59 2017 -0700
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Fri Jun 16 11:06:33 2017 +0200
tree 7147c81bb56dcc89d806d12bcf6425ac1384aee6
parent 1c29a766909399fe3183d6f7f54b992281c49b04

fix the compile error in Debug mode on Windows with Visual Studio

in debug mode macro expension in assert cause compile error.

BUG=aomedia:605

Change-Id: Ie5c47a8496d043c0ee2e4d0b94cc2cf7ff168e6c

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 4756119..374dd01 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -5376,14 +5376,14 @@
 
 #if CONFIG_TEMPMV_SIGNALING
   if (cm->use_prev_frame_mvs) {
-    assert(!cm->error_resilient_mode && cm->prev_frame &&
+    assert(!cm->error_resilient_mode && cm->prev_frame);
 #if CONFIG_FRAME_SUPERRES
-           cm->width == cm->last_width && cm->height == cm->last_height &&
+    assert(cm->width == cm->last_width && cm->height == cm->last_height);
 #else
-           cm->width == last_fb_ref_buf->buf->y_crop_width &&
-           cm->height == last_fb_ref_buf->buf->y_crop_height &&
+    assert(cm->width == last_fb_ref_buf->buf->y_crop_width &&
+           cm->height == last_fb_ref_buf->buf->y_crop_height);
 #endif  // CONFIG_FRAME_SUPERRES
-           !cm->prev_frame->intra_only);
+    assert(!cm->prev_frame->intra_only);
   }
 #else
   cm->use_prev_frame_mvs = !cm->error_resilient_mode && cm->prev_frame &&