aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorYu Xiaolei <dreifachstein@gmail.com>2014-05-20 10:14:05 +0800
committerMichael Niedermayer <michaelni@gmx.at>2014-05-20 15:29:57 +0200
commit2491579d4715e5c03559edd4ca7d300c8e89ffed (patch)
tree2dd7483b7f3aaac0f288daaf3f9854033527bb36 /configure
parent6310eb8010b7a3b3016e297132380cbd4e3d2d10 (diff)
downloadffmpeg-2491579d4715e5c03559edd4ca7d300c8e89ffed.tar.gz
configure: arm: do not enable fast-unaligned if it is explicitly disabled via commandline
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index 2a6a96b1f7..b6d35ae515 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