Skip to content

GitLab

Commit cea9147f authored by Martin Storsjo's avatar Martin Storsjo
Browse files

Make the mem_align routines 64-bit safe

parent 53ad2ee2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
amrwbenc/src/mem_align.c
View file @ cea9147f
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "mem_align.h" #include "mem_align.h"
#include <stdint.h>
/***************************************************************************** /*****************************************************************************
* *
...@@ -66,8 +67,8 @@ mem_malloc(VO_MEM_OPERATOR *pMemop, unsigned int size, unsigned char alignment, ...@@ -66,8 +67,8 @@ mem_malloc(VO_MEM_OPERATOR *pMemop, unsigned int size, unsigned char alignment,
pMemop->Set(CodecID, tmp, 0, size + alignment); pMemop->Set(CodecID, tmp, 0, size + alignment);
mem_ptr = mem_ptr =
(unsigned char *) ((unsigned int) (tmp + alignment - 1) & (unsigned char *) ((intptr_t) (tmp + alignment - 1) &
(~((unsigned int) (alignment - 1)))); (~((intptr_t) (alignment - 1))));
if (mem_ptr == tmp) if (mem_ptr == tmp)
mem_ptr += alignment; mem_ptr += alignment;
......
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