Commit a55444cb authored by Yaowu Xu's avatar Yaowu Xu

Fix msvc build warnings:

1. aom_mem.c: inline->INLINE
2. rd.c: make function declaration consistent.

Change-Id: I91ce13216e6ae7a82417a290b0575e83045f5dd2
parent b87cc923
...@@ -18,21 +18,21 @@ ...@@ -18,21 +18,21 @@
#include "include/aom_mem_intrnl.h" #include "include/aom_mem_intrnl.h"
#include "aom/aom_integer.h" #include "aom/aom_integer.h"
static inline size_t GetAlignedMallocSize(size_t size, size_t align) { static INLINE size_t GetAlignedMallocSize(size_t size, size_t align) {
return size + align - 1 + ADDRESS_STORAGE_SIZE; return size + align - 1 + ADDRESS_STORAGE_SIZE;
} }
static inline size_t *GetMallocAddressLocation(const void *const mem) { static INLINE size_t *GetMallocAddressLocation(const void *const mem) {
return ((size_t *)mem) - 1; return ((size_t *)mem) - 1;
} }
static inline void SetActualMallocAddress(void *const mem, static INLINE void SetActualMallocAddress(void *const mem,
const void *const malloc_addr) { const void *const malloc_addr) {
size_t *const malloc_addr_location = GetMallocAddressLocation(mem); size_t *const malloc_addr_location = GetMallocAddressLocation(mem);
*malloc_addr_location = (size_t)malloc_addr; *malloc_addr_location = (size_t)malloc_addr;
} }
static inline void *GetActualMallocAddress(const void *const mem) { static INLINE void *GetActualMallocAddress(const void *const mem) {
const size_t *const malloc_addr_location = GetMallocAddressLocation(mem); const size_t *const malloc_addr_location = GetMallocAddressLocation(mem);
return (void *)(*malloc_addr_location); return (void *)(*malloc_addr_location);
} }
......
...@@ -601,7 +601,7 @@ YV12_BUFFER_CONFIG *av1_get_scaled_ref_frame(const AV1_COMP *cpi, ...@@ -601,7 +601,7 @@ YV12_BUFFER_CONFIG *av1_get_scaled_ref_frame(const AV1_COMP *cpi,
: NULL; : NULL;
} }
int av1_get_switchable_rate(const AV1_COMP *cpi, const MACROBLOCKD *const xd) { int av1_get_switchable_rate(const AV1_COMP *cpi, const MACROBLOCKD *xd) {
const AV1_COMMON *const cm = &cpi->common; const AV1_COMMON *const cm = &cpi->common;
if (cm->interp_filter == SWITCHABLE) { if (cm->interp_filter == SWITCHABLE) {
#if CONFIG_EXT_INTERP #if CONFIG_EXT_INTERP
......
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