shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp8: fix quantizer clamping"

--- a/vp8/decoder/decodeframe.c

+++ b/vp8/decoder/decodeframe.c

@@ -73,10 +73,9 @@

         /* Delta Value */

         else

-        {

             QIndex = pc->base_qindex + xd->segment_feature_data[MB_LVL_ALT_Q][mbmi->segment_id];

-            QIndex = (QIndex >= 0) ? ((QIndex <= MAXQ) ? QIndex : MAXQ) : 0;    /* Clamp to valid range */

-        }

+

+        QIndex = (QIndex >= 0) ? ((QIndex <= MAXQ) ? QIndex : MAXQ) : 0;    /* Clamp to valid range */

     }

     else

         QIndex = pc->base_qindex;