diff options
| author | James Zern <jzern@google.com> | 2015-10-07 18:26:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-07 18:26:15 +0000 |
| commit | 05b4e1814272636ddd10ebfa9a28bf2f2a85cd45 (patch) | |
| tree | 82c8511f3feeb91b8e8e4938ffb24a4569f2dfea | |
| parent | d20f086be5ed4b8c6d452ed4f17104f56679d972 (diff) | |
| parent | d0f406366c7581409a3fbb05510d645380ba9ebd (diff) | |
| download | libvpx-05b4e1814272636ddd10ebfa9a28bf2f2a85cd45.tar libvpx-05b4e1814272636ddd10ebfa9a28bf2f2a85cd45.tar.gz libvpx-05b4e1814272636ddd10ebfa9a28bf2f2a85cd45.tar.bz2 libvpx-05b4e1814272636ddd10ebfa9a28bf2f2a85cd45.zip | |
Merge changes I2965e786,I144bedde
* changes:
vpx_memset16: drop unnecessary local
vpx_memset16: quiet signed/unsigned warning
| -rw-r--r-- | vpx_mem/vpx_mem.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vpx_mem/vpx_mem.c b/vpx_mem/vpx_mem.c index c6f501a6f..b98fe83c0 100644 --- a/vpx_mem/vpx_mem.c +++ b/vpx_mem/vpx_mem.c @@ -93,11 +93,10 @@ void vpx_free(void *memblk) { #if CONFIG_VP9_HIGHBITDEPTH void *vpx_memset16(void *dest, int val, size_t length) { - int i; - void *orig = dest; - uint16_t *dest16 = dest; + size_t i; + uint16_t *dest16 = (uint16_t *)dest; for (i = 0; i < length; i++) *dest16++ = val; - return orig; + return dest; } #endif // CONFIG_VP9_HIGHBITDEPTH |