diff options
| author | Johann <johannkoenig@google.com> | 2010-10-18 13:23:39 -0400 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2010-10-18 13:23:39 -0400 |
| commit | ce1ce992ce30f01c723b4fcf67ea17266ba91712 (patch) | |
| tree | bbe8eecad976b06159d14ba246e8fdb39af2ef70 /vp8 | |
| parent | 963bcd6c87078f3991d698e44450a8a9e327198c (diff) | |
| download | libvpx-ce1ce992ce30f01c723b4fcf67ea17266ba91712.tar libvpx-ce1ce992ce30f01c723b4fcf67ea17266ba91712.tar.gz libvpx-ce1ce992ce30f01c723b4fcf67ea17266ba91712.tar.bz2 libvpx-ce1ce992ce30f01c723b4fcf67ea17266ba91712.zip | |
copy compiler warning fixes
generic version got fixed, but not the arm version. fixes:
vp8/encoder/arm/mcomp_arm.c: In function 'vp8_full_search_sadx3':
vp8/encoder/arm/mcomp_arm.c:1208: warning: pointer targets in passing
argument 5 of 'fn_ptr->sdx3f' differ in signedness
vp8/encoder/arm/mcomp_arm.c:1208: note: expected 'unsigned int *' but
argument is of type 'int *'
and another unsigned change to keep the files similar
Change-Id: I1b6255dc3a03b90394a791ee0d15d8167d9454db
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/arm/mcomp_arm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/arm/mcomp_arm.c b/vp8/encoder/arm/mcomp_arm.c index 9a138e6fc..56358328e 100644 --- a/vp8/encoder/arm/mcomp_arm.c +++ b/vp8/encoder/arm/mcomp_arm.c @@ -1155,7 +1155,7 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er int r, c; unsigned char *check_here; - int thissad; + unsigned int thissad; int ref_row = ref_mv->row >> 3; int ref_col = ref_mv->col >> 3; @@ -1165,7 +1165,7 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er int col_min = ref_col - distance; int col_max = ref_col + distance; - int sad_array[3]; + unsigned int sad_array[3]; // Work out the mid point for the search in_what = *(d->base_pre) + d->pre; |