diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2013-05-02 13:44:33 -0400 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2013-05-02 13:44:33 -0400 |
| commit | 37c3144ed74e8573755f37219664cb9d2e26874c (patch) | |
| tree | 5f6e9b5342a535e7080ff726e7b638137e7e4b80 /vp9/decoder | |
| parent | dd1e6b8e6fb32af3692f9605ef5e1b4a3ca751b3 (diff) | |
| download | libvpx-37c3144ed74e8573755f37219664cb9d2e26874c.tar libvpx-37c3144ed74e8573755f37219664cb9d2e26874c.tar.gz libvpx-37c3144ed74e8573755f37219664cb9d2e26874c.tar.bz2 libvpx-37c3144ed74e8573755f37219664cb9d2e26874c.zip | |
Removed is_inter_mode() check
If a reference frame is inter, the only valid modes would
be inter modes. This check is unnecessary.
Change-Id: Ib8433ab5a3418f94149ee4e3062d48d7740d225a
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 55c67374a..d0c255e03 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -714,11 +714,9 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, #endif } - if (is_inter_mode(mbmi->mode)) { - mbmi->interp_filter = cm->mcomp_filter_type == SWITCHABLE - ? read_switchable_filter_type(pbi, r) - : cm->mcomp_filter_type; - } + mbmi->interp_filter = cm->mcomp_filter_type == SWITCHABLE + ? read_switchable_filter_type(pbi, r) + : cm->mcomp_filter_type; if (cm->comp_pred_mode == COMP_PREDICTION_ONLY || (cm->comp_pred_mode == HYBRID_PREDICTION && |