Commit 918ad13b authored by Debargha Mukherjee's avatar Debargha Mukherjee Committed by Gerrit Code Review
Browse files

Merge "Pick up correct dequant for segment with new-quant." into nextgenv2

parents 00b6ad1e 1e46c740
......@@ -511,7 +511,7 @@ int vp10_decode_block_tokens(MACROBLOCKD *const xd,
pd->dqcoeff, tx_size, tx_type,
dequant,
#if CONFIG_NEW_QUANT
pd->seg_dequant_nuq[0],
pd->seg_dequant_nuq[seg_id],
#endif // CONFIG_NEW_QUANT
ctx, sc->scan, sc->neighbors, r);
#else
......@@ -519,7 +519,7 @@ int vp10_decode_block_tokens(MACROBLOCKD *const xd,
pd->dqcoeff, tx_size, tx_type,
dequant,
#if CONFIG_NEW_QUANT
pd->seg_dequant_nuq[0],
pd->seg_dequant_nuq[seg_id],
#endif // CONFIG_NEW_QUANT
ctx, sc->scan, sc->neighbors, r);
#endif // !CONFIG_ANS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment