shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Converted assertion to returning error"

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -504,7 +504,11 @@

   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);