diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-10-15 15:27:48 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-15 15:27:48 -0700 |
| commit | e4d12a1352009496c279d62c1375fc63f059e649 (patch) | |
| tree | 3b84cfe7db621aca45629dd1f256973f31d826f7 /vp9 | |
| parent | f999d791e0a53f22db187cb65fa131f48d8ba9c4 (diff) | |
| parent | 50494d5c1b6899b8b9fbaf006a4a86c2b24f82ae (diff) | |
| download | libvpx-e4d12a1352009496c279d62c1375fc63f059e649.tar libvpx-e4d12a1352009496c279d62c1375fc63f059e649.tar.gz libvpx-e4d12a1352009496c279d62c1375fc63f059e649.tar.bz2 libvpx-e4d12a1352009496c279d62c1375fc63f059e649.zip | |
Merge "Converted assertion to returning error"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index d89d6b803..8c1399d79 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -504,7 +504,11 @@ 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); + if (bsize < BLOCK_8X8) { + vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, + "Invalid usage of segement feature on small blocks"); + return; + } } else { if (bsize >= BLOCK_8X8) mbmi->mode = read_inter_mode(cm, r, inter_mode_ctx); |