diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 13:49:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 13:49:26 +0100 |
| commit | 7181806dc18062c5d1da760dcfdfbb99893b91cd (patch) | |
| tree | cb3c42d82e410eae7c1d19cc0f28d6e2ab5bfca8 /configure | |
| parent | 8ee14aa5c7a283b09dbd3e82e21208c1aa1ab938 (diff) | |
| parent | 9ebd45c2d58ad9241ad09718679f0cf7fb57da52 (diff) | |
Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'
* commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52':
configure: do not bypass cpuflags section if --cpu not given
dct-test: arm: indicate required cpu features for optimised funcs
snow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793
arm: fix use of uninitialised value in ff_fft_fixed_init_arm()
avpicture: Don't assume a valid pix fmt in avpicture_get_size
Conflicts:
libavcodec/avpicture.c
libavcodec/snow.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -2806,10 +2806,7 @@ is_in $arch $ARCH_LIST || warn "unknown architecture $arch" enable $arch # Add processor-specific flags -if test "$cpu" = generic; then - : do nothing - -elif enabled aarch64; then +if enabled aarch64; then case $cpu in armv*) @@ -2984,8 +2981,10 @@ elif enabled x86; then fi -add_cflags $cpuflags -add_asflags $cpuflags +if [ "$cpu" != generic ]; then + add_cflags $cpuflags + add_asflags $cpuflags +fi # compiler sanity check check_exec <<EOF |