summaryrefslogtreecommitdiff
path: root/vp9/decoder
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2012-11-29 09:27:00 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2012-11-29 09:27:00 -0800
commit6431007df3880ba03880961c909fa316deeb545f (patch)
treede18c1fbce0d0a493f173ade9467301386c74f8a /vp9/decoder
parent245fba74b77474f8ad877355d78d9b426500ddf0 (diff)
parent7ab1d3e49f107e62793405914ca375745ae1f871 (diff)
downloadlibvpx-6431007df3880ba03880961c909fa316deeb545f.tar
libvpx-6431007df3880ba03880961c909fa316deeb545f.tar.gz
libvpx-6431007df3880ba03880961c909fa316deeb545f.tar.bz2
libvpx-6431007df3880ba03880961c909fa316deeb545f.zip
Merge "minor fix to eob check for setting CONTEXT" into experimental
Diffstat (limited to 'vp9/decoder')
-rw-r--r--vp9/decoder/vp9_detokenize.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c
index abc0c3a86..897ad5204 100644
--- a/vp9/decoder/vp9_detokenize.c
+++ b/vp9/decoder/vp9_detokenize.c
@@ -242,7 +242,7 @@ SKIP_START:
if (c < seg_eob)
coef_counts[coef_bands[c]][pt][DCT_EOB_TOKEN]++;
- a[0] = l[0] = (c != !type);
+ a[0] = l[0] = (c > !type);
return c;
}
@@ -290,11 +290,8 @@ static int vp9_decode_mb_tokens_16x16(VP9D_COMP* const pbi,
l[1] = l[0];
eobtotal += c;
}
-
- // no Y2 block
- vpx_memset(&A[8], 0, sizeof(A[8]));
- vpx_memset(&L[8], 0, sizeof(L[8]));
-
+ A[8] = 0;
+ L[8] = 0;
return eobtotal;
}