ref: 48556db7b2e190a8d5236062c1f63bb2681cedb4
parent: b95338c7abd1e70d43b972f9a4661ef0b6e2a5aa
parent: 0d687ed22b43a7b10154392ae39003e6ea8c82e8
author: Frank Galligan <fgalligan@google.com>
date: Mon Dec 3 12:29:46 EST 2012
Merge "vp9: Fix assert check." into vp9-preview
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -463,7 +463,7 @@
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 @@
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
--
⑨