diff options
| author | James Zern <jzern@google.com> | 2015-07-02 01:52:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-02 01:52:40 +0000 |
| commit | e7578084299b7cc24e987367b20180ad4a91d78f (patch) | |
| tree | ecc0efa0f3c6d3c96fe910006878ec9d73bda1dd /vp9/encoder | |
| parent | 0ea304620cb4a506060c2b9b2164e4a45261145c (diff) | |
| parent | 3edd293daeac89aa65e50d3b2417049652f5ea9e (diff) | |
| download | libvpx-e7578084299b7cc24e987367b20180ad4a91d78f.tar libvpx-e7578084299b7cc24e987367b20180ad4a91d78f.tar.gz libvpx-e7578084299b7cc24e987367b20180ad4a91d78f.tar.bz2 libvpx-e7578084299b7cc24e987367b20180ad4a91d78f.zip | |
Merge "vp9_pred_common: inline vp9_get_tx_size_context"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 3433d09a2..e94d43b14 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -4198,7 +4198,7 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, if (cm->tx_mode == TX_MODE_SELECT && mbmi->sb_type >= BLOCK_8X8 && !(is_inter_block(mbmi) && (mbmi->skip || seg_skip))) { - ++get_tx_counts(max_txsize_lookup[bsize], vp9_get_tx_size_context(xd), + ++get_tx_counts(max_txsize_lookup[bsize], get_tx_size_context(xd), &td->counts->tx)[mbmi->tx_size]; } else { int x, y; |