Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
918ad13b
Commit
918ad13b
authored
Jun 15, 2016
by
Debargha Mukherjee
Committed by
Gerrit Code Review
Jun 15, 2016
Browse files
Merge "Pick up correct dequant for segment with new-quant." into nextgenv2
parents
00b6ad1e
1e46c740
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp10/decoder/detokenize.c
View file @
918ad13b
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment