From e6501296834cdcfd1f7efb59eeed5562fc93c30e Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Wed, 16 Dec 2015 11:43:11 -0800 Subject: Move bit_depth init out of setup_quantization This also fixes a compiling error under --enable-vp9_highbitdepth. Change-Id: I9d1dcb95d3336d797eb3c23a4702c30b04355357 --- vp10/decoder/decodeframe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c index 31b9c7e49..c0fbc4949 100644 --- a/vp10/decoder/decodeframe.c +++ b/vp10/decoder/decodeframe.c @@ -1150,10 +1150,6 @@ static void setup_quantization(VP10_COMMON *const cm, cm->uv_dc_delta_q = read_delta_q(rb); cm->uv_ac_delta_q = read_delta_q(rb); cm->dequant_bit_depth = cm->bit_depth; - -#if CONFIG_VP9_HIGHBITDEPTH - xd->bd = (int)cm->bit_depth; -#endif } static void setup_segmentation_dequant(VP10_COMMON *const cm) { @@ -2092,6 +2088,10 @@ static size_t read_uncompressed_header(VP10Decoder *pbi, setup_loopfilter(&cm->lf, rb); setup_quantization(cm, rb); +#if CONFIG_VP9_HIGHBITDEPTH + xd->bd = (int)cm->bit_depth; +#endif + setup_segmentation(cm, rb); { -- cgit v1.2.3