Commit 05b4e181 authored by James Zern's avatar James Zern Committed by Gerrit Code Review

Merge changes I2965e786,I144bedde

* changes:
  vpx_memset16: drop unnecessary local
  vpx_memset16: quiet signed/unsigned warning
parents d20f086b d0f40636
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment