[FFmpeg-cvslog] mem: Fix usage of memalign() on DJGPP.

Fabrizio Gennari git at videolan.org
Sun Mar 10 11:14:00 CET 2013


ffmpeg | branch: master | Fabrizio Gennari <fabrizio.ge at tiscali.it> | Sun Mar 10 10:22:45 2013 +0100| [91b747ac78218805a79435f50587f87167569dad] | committer: Michael Niedermayer

mem: Fix usage of memalign() on DJGPP.

Credits to Khusraw of bttr-software.de forum.
Signed-off-by: Carl Eugen Hoyos <cehoyos at ag.or.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91b747ac78218805a79435f50587f87167569dad
---

 libavutil/mem.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavutil/mem.c b/libavutil/mem.c
index a7fe608..860c011 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



More information about the ffmpeg-cvslog mailing list