History

Merge "Converted assertion to returning error"

Yaowu Xu committed 13 years ago

Commit e4d12a12 parents f999d79 50494d51 file · +5 −1Browse files

Unified · Split

vp9/decoder/vp9_decodemv.c+5−1
@@ -504,7 +504,11 @@ static void read_inter_block_mode_info(VP9D_COMP *pbi, MODE_INFO *mi, · 503 unmodified lines
504504
505505 if (vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) {
506506 mbmi->mode = ZEROMV;
507− assert(bsize >= BLOCK_8X8);
507+ if (bsize < BLOCK_8X8) {
508+ vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,
509+ "Invalid usage of segement feature on small blocks");
510+ return;
511+ }
508512 } else {
509513 if (bsize >= BLOCK_8X8)
510514 mbmi->mode = read_inter_mode(cm, r, inter_mode_ctx);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t