[FFmpeg-cvslog] configure: arm: do not enable fast-unaligned if it is explicitly disabled via commandline

Yu Xiaolei git at videolan.org
Tue May 20 15:36:00 CEST 2014


ffmpeg | branch: master | Yu Xiaolei <dreifachstein at gmail.com> | Tue May 20 10:14:05 2014 +0800| [2491579d4715e5c03559edd4ca7d300c8e89ffed] | committer: Michael Niedermayer

configure: arm: do not enable fast-unaligned if it is explicitly disabled via commandline

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 configure |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 2a6a96b..b6d35ae 100755
--- a/configure
+++ b/configure
@@ -3615,7 +3615,10 @@ elif enabled arm; then
 
     case "$subarch" in
         armv5t*)    enable fast_clz                ;;
-        armv[6-8]*) enable fast_clz fast_unaligned ;;
+        armv[6-8]*)
+            enable fast_clz
+            disabled fast_unaligned || enable fast_unaligned
+            ;;
     esac
 
 elif enabled avr32; then



More information about the ffmpeg-cvslog mailing list