diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-09-05 08:15:03 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-09-05 08:15:03 -0700 |
| commit | 9158b8956f540693e0a5d98d5cda2e25f83c52fd (patch) | |
| tree | 11010ab4f045c910243722f4886433d6eb6bf8e4 | |
| parent | 7bc775d93dd4cfb6a80dc6afeb7fe5f7cd1a241b (diff) | |
| parent | 1ee66933c13834985b676f009bd16c1b78c72ff9 (diff) | |
| download | libvpx-9158b8956f540693e0a5d98d5cda2e25f83c52fd.tar libvpx-9158b8956f540693e0a5d98d5cda2e25f83c52fd.tar.gz libvpx-9158b8956f540693e0a5d98d5cda2e25f83c52fd.tar.bz2 libvpx-9158b8956f540693e0a5d98d5cda2e25f83c52fd.zip | |
Merge "make bsize requirement for SEG_LVL_SKIP explicit"
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 8dfb22c14..7f23dc190 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -460,6 +460,7 @@ static void read_inter_block_mode_info(VP9D_COMP *pbi, MODE_INFO *mi, if (vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) { mbmi->mode = ZEROMV; + assert(bsize >= BLOCK_8X8); } else { if (bsize >= BLOCK_8X8) mbmi->mode = read_inter_mode(cm, r, inter_mode_ctx); |