diff options
Diffstat (limited to 'third_party/aom/aom_ports/mem.h')
| -rw-r--r-- | third_party/aom/aom_ports/mem.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/aom/aom_ports/mem.h b/third_party/aom/aom_ports/mem.h index 500e397c6..0793d82e4 100644 --- a/third_party/aom/aom_ports/mem.h +++ b/third_party/aom/aom_ports/mem.h @@ -12,8 +12,8 @@ #ifndef AOM_PORTS_MEM_H_ #define AOM_PORTS_MEM_H_ -#include "aom_config.h" #include "aom/aom_integer.h" +#include "config/aom_config.h" #if (defined(__GNUC__) && __GNUC__) || defined(__SUNPRO_C) #define DECLARE_ALIGNED(n, typ, val) typ val __attribute__((aligned(n))) @@ -61,6 +61,8 @@ #define ALIGN_POWER_OF_TWO(value, n) \ (((value) + ((1 << (n)) - 1)) & ~((1 << (n)) - 1)) +#define DIVIDE_AND_ROUND(x, y) (((x) + ((y) >> 1)) / (y)) + #define CONVERT_TO_SHORTPTR(x) ((uint16_t *)(((uintptr_t)(x)) << 1)) #define CONVERT_TO_BYTEPTR(x) ((uint8_t *)(((uintptr_t)(x)) >> 1)) |