diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-13 11:36:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-13 11:36:46 +0200 |
| commit | df4f4fc8a50b4afe9a8d4b5f72c8638b6722888e (patch) | |
| tree | 1e6df6d60baa43d2c8bd8d7f66fd6dff3449c020 /configure | |
| parent | 69d52ef8ffcfc9246b58fd77b020f255ed64384b (diff) | |
| parent | 2c2c48a9bdbef51177204dfc2f151f3be257f9b8 (diff) | |
| download | ffmpeg-df4f4fc8a50b4afe9a8d4b5f72c8638b6722888e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: x86: Only enable cpunop on i686
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3797,7 +3797,7 @@ EOF die "yasm not found, use --disable-yasm for a crippled build" check_yasm "vextractf128 xmm0, ymm0, 0" || disable avx_external check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external - check_yasm "CPU amdnop" && enable cpunop + check_yasm "CPU amdnop" && enabled i686 && enable cpunop fi case "$cpu" in |