shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix issue 374: eob read incorrectly"

--- a/vp8/encoder/encodemb.c

+++ b/vp8/encoder/encodemb.c

@@ -479,7 +479,7 @@

     if(bd->dequant[0]>=35 && bd->dequant[1]>=35)

         return;

-    for(i=0;i<bd->eob;i++)

+    for(i=0;i<(*bd->eob);i++)

     {

         int coef = bd->dqcoeff[vp8_default_zig_zag1d[i]];

         sum+= (coef>=0)?coef:-coef;

@@ -496,14 +496,14 @@

     **************************************************************************/

     if(sum < 35)

     {

-        for(i=0;i<bd->eob;i++)

+        for(i=0;i<(*bd->eob);i++)

         {

             int rc = vp8_default_zig_zag1d[i];

             bd->qcoeff[rc]=0;

             bd->dqcoeff[rc]=0;

         }

-        bd->eob = 0;

-        *a = *l = (bd->eob != !type);

+        *bd->eob = 0;

+        *a = *l = (*bd->eob != !type);

     }

 }