diff options
| author | Jingning Han <jingning@google.com> | 2015-02-04 12:09:21 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-02-04 12:09:21 -0800 |
| commit | 1221641914b9c774cb4dc87c4c8578fb444611ef (patch) | |
| tree | ec723033b559c14fee41da9a5c69c884995fa47a /vp9/encoder | |
| parent | fb2bac40010da4f60b54c5d99f4333546af756b7 (diff) | |
| parent | 1b9082ec6b3013f632adac8884e39a6ccf6dcd6a (diff) | |
| download | libvpx-1221641914b9c774cb4dc87c4c8578fb444611ef.tar libvpx-1221641914b9c774cb4dc87c4c8578fb444611ef.tar.gz libvpx-1221641914b9c774cb4dc87c4c8578fb444611ef.tar.bz2 libvpx-1221641914b9c774cb4dc87c4c8578fb444611ef.zip | |
Merge "Unify luma and chroma inter predictors in choose_partitioning"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index a8e7f5ea6..b9d0809fd 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -535,8 +535,7 @@ static void choose_partitioning(VP9_COMP *cpi, mbmi->ref_frame[1] = NONE; mbmi->sb_type = BLOCK_64X64; mbmi->mv[0].as_int = 0; - vp9_build_inter_predictors_sby(xd, mi_row, mi_col, BLOCK_64X64); - vp9_build_inter_predictors_sbuv(xd, mi_row, mi_col, BLOCK_64X64); + vp9_build_inter_predictors_sb(xd, mi_row, mi_col, BLOCK_64X64); for (i = 1; i <= 2; ++i) { struct macroblock_plane *p = &x->plane[i]; |