From e886d223fe4ab0e77bc949fb54d10386e6a1a215 Mon Sep 17 00:00:00 2001 From: Tristan Matthews Date: Tue, 11 Jul 2017 23:48:00 -0400 Subject: [PATCH] entropymode: fix sizeof mismatch Fixes "aomenc: init_mode_probs: Assertion `sizeof(fc->motion_mode_prob) == sizeof(default_motion_mode_prob)' failed" Change-Id: I7b71304f50756ffd6e14b03fe338c0d624ce35c5 --- av1/common/entropymode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c index 5c0ea7b1c..9d9ffbc50 100644 --- a/av1/common/entropymode.c +++ b/av1/common/entropymode.c @@ -714,8 +714,8 @@ static const aom_prob const aom_tree_index av1_motion_mode_tree[TREE_SIZE(MOTION_MODES)] = { -SIMPLE_TRANSLATION, -OBMC_CAUSAL }; -static const aom_cdf_prob - default_motion_mode_prob[BLOCK_SIZES][MOTION_MODES - 1] = { +static const aom_prob default_motion_mode_prob[BLOCK_SIZES][MOTION_MODES - 1] = + { #if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8 { 255 }, { 255 }, { 255 }, #endif -- GitLab