diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-08-01 06:46:40 -0700 |
|---|---|---|
| committer | Jim Bankoski <jimbankoski@google.com> | 2014-08-04 08:52:40 -0700 |
| commit | c3591463f4d36207053f3f70217c66e61ccdf217 (patch) | |
| tree | c805b59aaec9c5f7790ccc8a36ad422fb612ca69 | |
| parent | 3cf5908e24a744489dd3b93f8656a7d3c392bad7 (diff) | |
| download | libvpx-c3591463f4d36207053f3f70217c66e61ccdf217.tar libvpx-c3591463f4d36207053f3f70217c66e61ccdf217.tar.gz libvpx-c3591463f4d36207053f3f70217c66e61ccdf217.tar.bz2 libvpx-c3591463f4d36207053f3f70217c66e61ccdf217.zip | |
avoid signed mismatch warning in gcc
Change-Id: I9d995178fd764be252e571fa23901da0f991bbb8
| -rw-r--r-- | vp9/encoder/vp9_rd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c index c149c6136..f1c25be95 100644 --- a/vp9/encoder/vp9_rd.c +++ b/vp9/encoder/vp9_rd.c @@ -313,8 +313,8 @@ void vp9_model_rd_from_var_lapndz(unsigned int var, unsigned int n, int d_q10, r_q10; const uint64_t xsq_q10_64 = ((((uint64_t)qstep * qstep * n) << 10) + (var >> 1)) / var; - const int xsq_q10 = xsq_q10_64 > MAX_XSQ_Q10 ? - MAX_XSQ_Q10 : (int)xsq_q10_64; + const int xsq_q10 = xsq_q10_64 > (uint64_t)MAX_XSQ_Q10 ? + (int)MAX_XSQ_Q10 : (int)xsq_q10_64; model_rd_norm(xsq_q10, &r_q10, &d_q10); *rate = (n * r_q10 + 2) >> 2; *dist = (var * (int64_t)d_q10 + 512) >> 10; |