[FFmpeg-cvslog] configure: enable memalign_hack automatically when needed

Mans Rullgard git at videolan.org
Wed May 25 06:37:13 CEST 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Tue May 24 20:11:53 2011 +0100| [9bbd6a4cd89da4bfc9fd36fea5777a539a542b40] | committer: Mans Rullgard

configure: enable memalign_hack automatically when needed

Signed-off-by: Mans Rullgard <mans at mansr.com>

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

 configure |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 5e3d6fb..c628ff6 100755
--- a/configure
+++ b/configure
@@ -2823,11 +2823,6 @@ check_header X11/extensions/XvMClib.h
 
 check_struct dxva2api.h DXVA_PictureParameters wDecodedPictureIndex
 
-if ! enabled_any memalign memalign_hack posix_memalign malloc_aligned &&
-     enabled_any $need_memalign ; then
-    die "Error, no aligned memory allocator but SSE enabled, disable it or use --enable-memalign-hack."
-fi
-
 disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
 disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
 
@@ -3091,6 +3086,9 @@ check_deps $CONFIG_LIST       \
 
 enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
 
+! enabled_any memalign posix_memalign malloc_aligned &&
+    enabled_any $need_memalign && enable memalign_hack
+
 echo "install prefix            $prefix"
 echo "source path               $source_path"
 echo "C compiler                $cc"



More information about the ffmpeg-cvslog mailing list