From: Jingning Han <jingning@google.com>
Date: Tue, 3 Dec 2013 23:25:16 +0000 (-0800)
Subject: Fix initialization order for the encoder
X-Git-Tag: v1.4.0~2916
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c34619125ea8a5ea1657d06d7c4d970d0a30599;p=libvpx

Fix initialization order for the encoder

This commit makes the coefficient tree initialized prior to token
initialization, where the coefficient costs are filled out according
to the probabilities associated with coefficient value categories.

Change-Id: If4e89c3923058376f8382c683fe4a225a4a38af3
---

diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 968cbfbce..852cedfd5 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -159,6 +159,7 @@ void vp9_initialize_enc() {
 
   if (!init_done) {
     vp9_initialize_common();
+    vp9_coef_tree_initialize();
     vp9_tokenize_initialize();
     vp9_init_quant_tables();
     vp9_init_me_luts();
@@ -166,7 +167,6 @@ void vp9_initialize_enc() {
     // init_base_skip_probs();
     vp9_entropy_mv_init();
     vp9_entropy_mode_init();
-    vp9_coef_tree_initialize();
     init_done = 1;
   }
 }