diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-01-13 11:35:00 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-01-13 11:35:00 -0500 |
| commit | 05be0987486d02f9b104270896ea77b60849c3e0 (patch) | |
| tree | a7a4b45dfcfff14a1762d71c146f673d9c3fcf92 /vp8/encoder/encodeframe.c | |
| parent | 2dc04461f26b749cee78b8834c066316031b0107 (diff) | |
| parent | 757a45f3ebcb62ae1262c80f68eee447d6788de5 (diff) | |
| download | libvpx-05be0987486d02f9b104270896ea77b60849c3e0.tar libvpx-05be0987486d02f9b104270896ea77b60849c3e0.tar.gz libvpx-05be0987486d02f9b104270896ea77b60849c3e0.tar.bz2 libvpx-05be0987486d02f9b104270896ea77b60849c3e0.zip | |
Merge remote branch 'internal/upstream-experimental' into HEAD
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 5a727af3d..138239843 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -416,7 +416,6 @@ unsigned int vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x) int sum; unsigned int a; unsigned int b; - unsigned int d; /* TODO: This could also be done over smaller areas (8x8), but that would * require extensive changes elsewhere, as lambda is assumed to be fixed * over an entire MB in most of the code. @@ -674,7 +673,6 @@ void vp8_encode_frame(VP8_COMP *cpi) VP8_COMMON *const cm = & cpi->common; MACROBLOCKD *const xd = & x->e_mbd; - int i; TOKENEXTRA *tp = cpi->tok; #if CONFIG_SEGMENTATION int segment_counts[MAX_MB_SEGMENTS + SEEK_SEGID]; |