diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-30 11:27:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-30 11:27:51 -0700 |
| commit | f5827699bf96a9f2ba046c10e239f3dfb5aa6667 (patch) | |
| tree | 5e8e6185a065fd279a3a488737ed11daa6314f0d /vp9/encoder/vp9_onyx_if.c | |
| parent | 5e97862a71b69ae9c552084386a5dd86df74e3dc (diff) | |
| parent | 98c192ae83a4a5f470ac63162af321b6085994f3 (diff) | |
| download | libvpx-f5827699bf96a9f2ba046c10e239f3dfb5aa6667.tar libvpx-f5827699bf96a9f2ba046c10e239f3dfb5aa6667.tar.gz libvpx-f5827699bf96a9f2ba046c10e239f3dfb5aa6667.tar.bz2 libvpx-f5827699bf96a9f2ba046c10e239f3dfb5aa6667.zip | |
Merge "Merge all intra mode coding trees into a single one." into experimental
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index fac857a98..4b4a479dd 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -3207,10 +3207,8 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, } if (cpi->common.frame_type != KEY_FRAME) { - vp9_copy(cpi->common.fc.sb_ymode_counts, cpi->sb_ymode_count); - vp9_copy(cpi->common.fc.ymode_counts, cpi->ymode_count); + vp9_copy(cpi->common.fc.y_mode_counts, cpi->y_mode_count); vp9_copy(cpi->common.fc.uv_mode_counts, cpi->y_uv_mode_count); - vp9_copy(cpi->common.fc.bmode_counts, cpi->bmode_count); vp9_copy(cpi->common.fc.partition_counts, cpi->partition_count); cpi->common.fc.NMVcount = cpi->NMVcount; if (!cpi->common.error_resilient_mode && |