Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabrizio Gennari <fabrizio.ge@tiscali.it>2013-03-10 13:22:45 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-03-15 02:30:35 +0400
commite820e3a2591a0d544925ff1522d2a688a647f1b0 (patch)
treea4a94f6058cc2cb11114ff470c43ae5cb79d7fba
parent17911d0a96a8e8fa3390d719c4433775cdb573a0 (diff)
mem: Fix usage of memalign() on DJGPP.n1.2
Credits to Khusraw of bttr-software.de forum. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at> (cherry picked from commit 91b747ac78218805a79435f50587f87167569dad) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/mem.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c
index a7fe60837b..860c0111eb 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -95,7 +95,11 @@ void *av_malloc(size_t size)
#elif HAVE_ALIGNED_MALLOC
ptr = _aligned_malloc(size, ALIGN);
#elif HAVE_MEMALIGN
+#ifndef __DJGPP__
ptr = memalign(ALIGN, size);
+#else
+ ptr = memalign(size, ALIGN);
+#endif
/* Why 64?
* Indeed, we should align it:
* on 4 for 386