diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2011-11-04 11:31:17 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2011-11-04 11:31:17 -0700 |
| commit | 44b5f76e3476e27840371539cf68ed04a6f85c6c (patch) | |
| tree | ede946d2537ccebd6f8794c6f4af0627382f03f6 /vp8/encoder | |
| parent | 7ca6c91732b2649e58d74794edf34d16aab2fac0 (diff) | |
| parent | d497ec688d796e06a2611396215f8ecade5aec95 (diff) | |
| download | libvpx-44b5f76e3476e27840371539cf68ed04a6f85c6c.tar libvpx-44b5f76e3476e27840371539cf68ed04a6f85c6c.tar.gz libvpx-44b5f76e3476e27840371539cf68ed04a6f85c6c.tar.bz2 libvpx-44b5f76e3476e27840371539cf68ed04a6f85c6c.zip | |
Merge "Fix issue 374: eob read incorrectly"
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/encodemb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/encoder/encodemb.c b/vp8/encoder/encodemb.c index faa1a8e33..db83b2f75 100644 --- a/vp8/encoder/encodemb.c +++ b/vp8/encoder/encodemb.c @@ -479,7 +479,7 @@ static void check_reset_2nd_coeffs(MACROBLOCKD *x, int type, 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 @@ static void check_reset_2nd_coeffs(MACROBLOCKD *x, int type, **************************************************************************/ 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); } } |