summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/ffmpeg/P03-darwin-memalign.patch16
1 files changed, 0 insertions, 16 deletions
diff --git a/contrib/ffmpeg/P03-darwin-memalign.patch b/contrib/ffmpeg/P03-darwin-memalign.patch
deleted file mode 100644
index 0747dfa3c..000000000
--- a/contrib/ffmpeg/P03-darwin-memalign.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/libavutil/mem.c b/libavutil/mem.c
-index bf1a542..a32d400 100644
---- a/libavutil/mem.c
-+++ b/libavutil/mem.c
-@@ -82,6 +82,11 @@ void *av_malloc(size_t size)
- ptr = (char*)ptr + diff;
- ((char*)ptr)[-1]= diff;
- #elif HAVE_POSIX_MEMALIGN
-+#if defined(__APPLE__)
-+ if (size == 0)
-+ ptr = NULL;
-+ else
-+#endif
- if (posix_memalign(&ptr,32,size))
- ptr = NULL;
- #elif HAVE_MEMALIGN