diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-12-16 11:43:11 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2015-12-16 11:43:11 -0800 |
| commit | e6501296834cdcfd1f7efb59eeed5562fc93c30e (patch) | |
| tree | d12afee1e5423a84b20c529fd5364a500b52f6ae | |
| parent | f73a511d37f75a3400e854e4b38bc2e2ba28687c (diff) | |
| download | libvpx-e6501296834cdcfd1f7efb59eeed5562fc93c30e.tar libvpx-e6501296834cdcfd1f7efb59eeed5562fc93c30e.tar.gz libvpx-e6501296834cdcfd1f7efb59eeed5562fc93c30e.tar.bz2 libvpx-e6501296834cdcfd1f7efb59eeed5562fc93c30e.zip | |
Move bit_depth init out of setup_quantization
This also fixes a compiling error under --enable-vp9_highbitdepth.
Change-Id: I9d1dcb95d3336d797eb3c23a4702c30b04355357
| -rw-r--r-- | vp10/decoder/decodeframe.c | 8 |
1 files 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); { |