diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 22:25:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 22:25:13 +0100 |
commit | 38336f0fb10a0a1dbcbbf371d0ab90520cee29c0 (patch) | |
tree | 6929e67a5068d4333aa971af67511bb5852e6a07 | |
parent | 96ea3dea5805404e929d9d8611acb431792df6cf (diff) | |
parent | 5800ba0db667630e6ff81d30f03961ea10726aa6 (diff) | |
download | ffmpeg-streaming-38336f0fb10a0a1dbcbbf371d0ab90520cee29c0.zip ffmpeg-streaming-38336f0fb10a0a1dbcbbf371d0ab90520cee29c0.tar.gz |
Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'
* commit '5800ba0db667630e6ff81d30f03961ea10726aa6':
configure: disable cpunop if the check fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4257,7 +4257,7 @@ EOF check_yasm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external check_yasm "vfmadd132ps ymm0, ymm1, ymm2" || disable fma3_external check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external - check_yasm "CPU amdnop" && enable cpunop + check_yasm "CPU amdnop" || disable cpunop fi case "$cpu" in |