diff options
| author | Rodeo <[email protected]> | 2012-09-07 14:47:56 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-09-07 14:47:56 +0000 |
| commit | 772f360f99b3de05477a2f888cfd99fefbc1f2de (patch) | |
| tree | c384b60da62013b67509dd332ca94cfd9c240fe4 /contrib/ffmpeg | |
| parent | 8d9969febdcec59fee453888ed0bb6a64adf7679 (diff) | |
Remove redundant patch. It's been superseded by http://git.libav.org/?p=libav.git;a=commit;h=14f063d294a18a31928d2167a66b1087910e14c8
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4931 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
| -rw-r--r-- | contrib/ffmpeg/P03-darwin-memalign.patch | 16 |
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 |