diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2016-07-11 22:31:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-11 22:31:06 +0000 |
| commit | 2e93fcf89343c4d9a38e9fcd06760fe7a32013c9 (patch) | |
| tree | 1ffc2a0518bb3daa7f5eeabfeae5f23234f4093d /vp9/encoder/vp9_rdopt.c | |
| parent | 5adb43b8bea52f308c2a8c113cffcf840672dfda (diff) | |
| parent | ed7786869aaa5b191450c674ddbf410aa5803c5b (diff) | |
| download | libvpx-2e93fcf89343c4d9a38e9fcd06760fe7a32013c9.tar libvpx-2e93fcf89343c4d9a38e9fcd06760fe7a32013c9.tar.gz libvpx-2e93fcf89343c4d9a38e9fcd06760fe7a32013c9.tar.bz2 libvpx-2e93fcf89343c4d9a38e9fcd06760fe7a32013c9.zip | |
Merge "vp9_rd_pick_intra_mode_sb(): set interp_filter to"
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index a0b813bf7..02a60e280 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2917,6 +2917,9 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, ctx->skip = 0; xd->mi[0]->ref_frame[0] = INTRA_FRAME; xd->mi[0]->ref_frame[1] = NONE; + // Initialize interp_filter here so we do not have to check for inter block + // modes in get_pred_context_switchable_interp() + xd->mi[0]->interp_filter = SWITCHABLE_FILTERS; if (bsize >= BLOCK_8X8) { if (rd_pick_intra_sby_mode(cpi, x, &rate_y, &rate_y_tokenonly, |