diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2016-04-15 19:06:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-04-15 19:06:33 +0000 |
| commit | 9faa0296b820173c97884483d9890761291a1b0a (patch) | |
| tree | 6e54bec84c0a99192ada30e4e6c962cb7c359f9d /vp9/encoder | |
| parent | c59c5cbefff9d833158cc25d9f2ae33f27977cc7 (diff) | |
| parent | ef98a8f61f81a488e59855eeca83711228047d12 (diff) | |
| download | libvpx-9faa0296b820173c97884483d9890761291a1b0a.tar libvpx-9faa0296b820173c97884483d9890761291a1b0a.tar.gz libvpx-9faa0296b820173c97884483d9890761291a1b0a.tar.bz2 libvpx-9faa0296b820173c97884483d9890761291a1b0a.zip | |
Merge "VP9: inline vp9_get_intra_inter_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 cdc58ea84..634e5cfe8 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1404,7 +1404,7 @@ static void update_stats(VP9_COMMON *cm, ThreadData *td) { const int seg_ref_active = segfeature_active(&cm->seg, mi->segment_id, SEG_LVL_REF_FRAME); if (!seg_ref_active) { - counts->intra_inter[vp9_get_intra_inter_context(xd)][inter_block]++; + counts->intra_inter[get_intra_inter_context(xd)][inter_block]++; // If the segment reference feature is enabled we have only a single // reference frame allowed for the segment so exclude it from // the reference frame counts used to work out probabilities. |