Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / mem.c

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 4253740a1088dcdb1b2f6a600a3eda246c7a4756..250b5f745ef68aee2ed82535e5513303a5903f10 100644 (file)
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -84,7 +84,7 @@ void *av_malloc(size_t size)
     ptr = malloc(size + ALIGN);
     if (!ptr)
         return ptr;
-    diff              = ((-(long)ptr - 1)&(ALIGN - 1)) + 1;
+    diff              = ((~(long)ptr)&(ALIGN - 1)) + 1;
     ptr               = (char *)ptr + diff;
     ((char *)ptr)[-1] = diff;
 #elif HAVE_POSIX_MEMALIGN