diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-19 23:05:00 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-19 23:05:03 -0500 |
| commit | d2499ead93dc4298c0882fe98902acb1b5209f99 (patch) | |
| tree | cb0b942aed59e5108f9a3e9d64e7b77854383421 /third_party/aom/av1/common/pred_common.c | |
| parent | 41fbdea457bf50c0a43e1c27c5cbf7f0a3a9eb33 (diff) | |
| download | UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.gz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.lz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.xz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.zip | |
Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591
Diffstat (limited to 'third_party/aom/av1/common/pred_common.c')
| -rw-r--r-- | third_party/aom/av1/common/pred_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/aom/av1/common/pred_common.c b/third_party/aom/av1/common/pred_common.c index d77739d85..5952441d1 100644 --- a/third_party/aom/av1/common/pred_common.c +++ b/third_party/aom/av1/common/pred_common.c @@ -31,8 +31,8 @@ int av1_get_pred_context_switchable_interp(const MACROBLOCKD *xd, int dir) { const MB_MODE_INFO *const mbmi = xd->mi[0]; const int ctx_offset = (mbmi->ref_frame[1] > INTRA_FRAME) * INTER_FILTER_COMP_OFFSET; - MV_REFERENCE_FRAME ref_frame = - (dir < 2) ? mbmi->ref_frame[0] : mbmi->ref_frame[1]; + assert(dir == 0 || dir == 1); + const MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame[0]; // Note: // The mode info data structure has a one element border above and to the // left of the entries corresponding to real macroblocks. |