diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-09 15:10:49 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-09 15:10:49 -0800 |
| commit | 347df4ce55a82120944a4e2ee6cdf060b2f8307a (patch) | |
| tree | cca6c77a49c19e9d66fd7d22c74f98dcdae30c5b /vp9/encoder | |
| parent | 2c3120274a7f24bba9205b5f7e7a074b4155812a (diff) | |
| parent | cb92f4f042a932c8f35d0a56b0691c7f3b1121af (diff) | |
| download | libvpx-347df4ce55a82120944a4e2ee6cdf060b2f8307a.tar libvpx-347df4ce55a82120944a4e2ee6cdf060b2f8307a.tar.gz libvpx-347df4ce55a82120944a4e2ee6cdf060b2f8307a.tar.bz2 libvpx-347df4ce55a82120944a4e2ee6cdf060b2f8307a.zip | |
Merge "Renaming vp9_get_pred_context_tx_size() function."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 8243813f0..342b11a8f 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2589,9 +2589,8 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled, !(is_inter_block(mbmi) && (mbmi->skip_coeff || vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP)))) { - const uint8_t context = vp9_get_pred_context_tx_size(xd); - ++get_tx_counts(max_txsize_lookup[bsize], - context, &cm->counts.tx)[mbmi->tx_size]; + ++get_tx_counts(max_txsize_lookup[bsize], vp9_get_tx_size_context(xd), + &cm->counts.tx)[mbmi->tx_size]; } else { int x, y; TX_SIZE tx_size; |