Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-09 16:00:33 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-10-09 16:17:56 +0400
commit4ce82e6fa94c96ec2db76ce3be200e58f0a577c3 (patch)
tree6ec6dc1ee385bfdaf9c0eecc998d53c34ccb480d /configure
parent56db86a0b2bfc486910c236596cf9911ab0e9fd4 (diff)
parent9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1 (diff)
Merge commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1'
* commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1': build: Require yasm 0.8.0 or higher Conflicts: configure If someone wants to continue supporting older yasm/nasm versions, patches are of course welcome! Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 5423a6845f..f2f555425b 100755
--- a/configure
+++ b/configure
@@ -4018,8 +4018,8 @@ EOF
elf*) enabled debug && append YASMFLAGS $yasm_debug ;;
esac
- check_yasm "pextrd [eax], xmm0, 1" && enable yasm ||
- die "yasm not found, use --disable-yasm for a crippled build"
+ check_yasm "movbe ecx, [5]" && enable yasm ||
+ die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build."
check_yasm "vextractf128 xmm0, ymm0, 0" || disable avx_external avresample
check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
check_yasm "CPU amdnop" && enable cpunop