diff options
| author | pascal massimino <pascal.massimino@gmail.com> | 2012-10-23 14:00:01 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-23 14:00:01 -0700 |
| commit | 73d387dcd2e03b77c2ccef9b40c2e6d103bafdc4 (patch) | |
| tree | 42b3de65ba1df5a461a6566c439ac869e39f94d0 /vp8 | |
| parent | d3b7c850a478f6d49a234257c6b3fc71d1945f92 (diff) | |
| parent | 6498516bb6fe15cc8f3d8b895f1f10ba3cbc44fb (diff) | |
| download | libvpx-73d387dcd2e03b77c2ccef9b40c2e6d103bafdc4.tar libvpx-73d387dcd2e03b77c2ccef9b40c2e6d103bafdc4.tar.gz libvpx-73d387dcd2e03b77c2ccef9b40c2e6d103bafdc4.tar.bz2 libvpx-73d387dcd2e03b77c2ccef9b40c2e6d103bafdc4.zip | |
Merge "Change eob[] array type in splitmv RD loop to a regular integer." into experimental
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/rdopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index e919de36f..97a38dd8b 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -2247,7 +2247,7 @@ typedef struct { int segment_yrate; B_PREDICTION_MODE modes[16]; int_mv mvs[16], second_mvs[16]; - unsigned char eobs[16]; + int eobs[16]; int mvthresh; int *mdcounts; @@ -2287,7 +2287,7 @@ static void rd_check_segment_txsize(VP8_COMP *cpi, MACROBLOCK *x, int rate = 0; int sbr = 0, sbd = 0; int segmentyrate = 0; - uint8_t best_eobs[16] = { 0 }; + int best_eobs[16] = { 0 }; vp8_variance_fn_ptr_t *v_fn_ptr; |