diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-11 15:24:22 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-11 15:24:22 +0200 |
commit | ec7946853a24855cc4e889f788195f57ce59ccab (patch) | |
tree | 323a8434157c2136b0ebd5e563bb0b566ac5bb8c /configure | |
parent | 7b56dddd565438e5c9a9bfcd0a55e087ce0800fe (diff) | |
parent | 55e778bebd6352977eebe406b522e2e9aed7ce35 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec_jpeg: Add support for default quantizers
x86: dsputil: Move specific optimization settings out of global init function
avplay: get rid of ugly casts in the options table
avplay: fix prototypes for option callbacks.
flvdec: always set AVFMTCTX_NOHEADER.
file: Use a normal private context for storing the file descriptor
configure: Adjust the xgetbv instrinsic check
configure: Add --disable-inline-asm command line option
configure: Don't try to enable the log2 function on msvcrt
Conflicts:
configure
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavformat/file.c
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -290,6 +290,7 @@ Optimization options (experts only): --disable-mmi disable MMI optimizations --disable-neon disable NEON optimizations --disable-vis disable VIS optimizations + --disable-inline-asm disable use of inline assembler --disable-yasm disable use of yasm assembler --disable-mips32r2 disable MIPS32R2 optimizations --disable-mipsdspr1 disable MIPS DSP ASE R1 optimizations @@ -1429,6 +1430,7 @@ CMDLINE_SELECT=" cross_compile debug extra_warnings + inline_asm logging optimizations stripping @@ -1549,6 +1551,8 @@ need_memalign="altivec neon sse" symver_if_any="symver_asm_label symver_gnu_asm" +log2_deps="!msvcrt" + # subsystems dct_select="rdft" mdct_select="fft" @@ -3241,7 +3245,7 @@ EOF sym=$($nm $nm_opts $TMPO | awk '/ff_extern/{ print substr($0, match($0, /[^ \t]*ff_extern/)) }') extern_prefix=${sym%%ff_extern*} -check_cc <<EOF && enable inline_asm +check_cc <<EOF && enable_weak inline_asm void foo(void) { __asm__ volatile ("" ::); } EOF @@ -3350,7 +3354,7 @@ elif enabled sparc; then elif enabled x86; then - check_code ld immintrin.h "__xgetbv(0)" "cc" && enable xgetbv + check_code ld immintrin.h "return __xgetbv(0)" "cc" && enable xgetbv check_code ld intrin.h "int info[4]; __cpuid(info, 0)" "cc" && enable cpuid check_code ld intrin.h "__rdtsc()" "cc" && enable rdtsc check_code ld intrin.h "unsigned int x = __readeflags()" "cc" && enable rweflags |