From 0d687ed22b43a7b10154392ae39003e6ea8c82e8 Mon Sep 17 00:00:00 2001 From: Frank Galligan Date: Mon, 3 Dec 2012 12:18:59 -0800 Subject: [PATCH] vp9: Fix assert check. Change-Id: If0cc1ab60dff6abd67dae7c7b3dc83a1afd7fe65 --- vp9/encoder/vp9_encodeframe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index b7f8cf4..d2008a7 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -463,7 +463,7 @@ static void update_state(VP9_COMP *cpi, MACROBLOCK *x, if (mb_mode == B_PRED) { for (i = 0; i < 16; i++) { xd->block[i].bmi.as_mode = xd->mode_info_context->bmi[i].as_mode; - assert(xd->block[i].bmi.as_mode.first < MB_MODE_COUNT); + assert(xd->block[i].bmi.as_mode.first < B_MODE_COUNT); } } else if (mb_mode == I8X8_PRED) { for (i = 0; i < 16; i++) { @@ -931,7 +931,7 @@ static void pick_sb_modes (VP9_COMP *cpi, xd->mode_info_context->mbmi.segment_id = 0; x->active_ptr = cpi->active_map + map_index; - + cpi->update_context = 0; // TODO Do we need this now?? /* Find best coding mode & reconstruct the MB so it is available -- 2.7.4