summaryrefslogtreecommitdiff
path: root/vp8/decoder
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-05-11 00:05:07 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-05-11 00:05:07 -0400
commit6edd07d6561522f81b2a09a2a160d74808b14363 (patch)
treeb4cafb01213b1f5405154b72ed1534600cb7dc48 /vp8/decoder
parent7f7c13838c80523965150ed5b1a636ad1ae7480d (diff)
parentb08c6fa6993fe0135ee149e2ce10b078ad494b8e (diff)
downloadlibvpx-6edd07d6561522f81b2a09a2a160d74808b14363.tar
libvpx-6edd07d6561522f81b2a09a2a160d74808b14363.tar.gz
libvpx-6edd07d6561522f81b2a09a2a160d74808b14363.tar.bz2
libvpx-6edd07d6561522f81b2a09a2a160d74808b14363.zip
Merge remote branch 'internal/upstream-experimental' into HEAD
Diffstat (limited to 'vp8/decoder')
-rw-r--r--vp8/decoder/arm/dequantize_arm.c2
-rw-r--r--vp8/decoder/threading.c3
2 files changed, 0 insertions, 5 deletions
diff --git a/vp8/decoder/arm/dequantize_arm.c b/vp8/decoder/arm/dequantize_arm.c
index d88adb729..98db6eeff 100644
--- a/vp8/decoder/arm/dequantize_arm.c
+++ b/vp8/decoder/arm/dequantize_arm.c
@@ -26,7 +26,6 @@ extern void vp8_dequantize_b_loop_v6(short *Q, short *DQC, short *DQ);
void vp8_dequantize_b_neon(BLOCKD *d)
{
- int i;
short *DQ = d->dqcoeff;
short *Q = d->qcoeff;
short *DQC = d->dequant;
@@ -38,7 +37,6 @@ void vp8_dequantize_b_neon(BLOCKD *d)
#if HAVE_ARMV6
void vp8_dequantize_b_v6(BLOCKD *d)
{
- int i;
short *DQ = d->dqcoeff;
short *Q = d->qcoeff;
short *DQC = d->dequant;
diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c
index 9ef85e9cd..de1583473 100644
--- a/vp8/decoder/threading.c
+++ b/vp8/decoder/threading.c
@@ -91,7 +91,6 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m
{
int eobtotal = 0;
int i, do_clamp = xd->mode_info_context->mbmi.need_to_clamp_mvs;
- VP8_COMMON *pc = &pbi->common;
if (xd->mode_info_context->mbmi.mb_skip_coeff)
{
@@ -478,7 +477,6 @@ void vp8_decoder_create_threads(VP8D_COMP *pbi)
void vp8mt_de_alloc_temp_buffers(VP8D_COMP *pbi, int mb_rows)
{
- VP8_COMMON *const pc = & pbi->common;
int i;
if (pbi->b_multithreaded_rd)
@@ -699,7 +697,6 @@ void vp8mt_decode_mb_rows( VP8D_COMP *pbi, MACROBLOCKD *xd)
int mb_row;
VP8_COMMON *pc = &pbi->common;
- int ibc = 0;
int num_part = 1 << pbi->common.multi_token_partition;
int i;
volatile int *last_row_current_mb_col = NULL;