diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-12 13:43:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-12 13:43:03 +0200 |
commit | d0bf3bf1ffaf810d8e0737847666a9b86ea5929f (patch) | |
tree | bc4e81051e590e5d33b401b6488ce381a37c6151 /configure | |
parent | 6fd7bf7b03c068d0f91de03bdd9b4e91695680eb (diff) | |
parent | bdefe22b8e8c5c1cbcb20595b8eedc052aa8e6e9 (diff) | |
download | ffmpeg-d0bf3bf1ffaf810d8e0737847666a9b86ea5929f.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: Detect discontinuities in timestamps for framerate/analyzeduration calculation
lavf: Initialize the stream info timestamps in avformat_new_stream
id3v2: Match PIC mimetype/format case-insensitively
configure: Rename check_asm() to more fitting check_inline_asm()
fate: Only test enabled filters
avresample: De-doxygenize some comments where Doxygen is not appropriate
rtmp: split chunk_size var into in_chunk_size and out_chunk_size
rtmp: Factorize the code by adding find_tracked_method
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 56 |
1 files changed, 28 insertions, 28 deletions
@@ -711,8 +711,8 @@ check_as(){ check_cmd $as $CPPFLAGS $ASFLAGS "$@" $AS_C -o $TMPO $TMPC } -check_asm(){ - log check_asm "$@" +check_inline_asm(){ + log check_inline_asm "$@" name="$1" code="$2" shift 2 @@ -3123,40 +3123,39 @@ EOF warn "Compiler does not indicate floating-point ABI, guessing $fpabi." fi - enabled armv5te && check_asm armv5te '"qadd r0, r0, r0"' - enabled armv6 && check_asm armv6 '"sadd16 r0, r0, r0"' - enabled armv6t2 && check_asm armv6t2 '"movt r0, #0"' - enabled armvfp && check_asm armvfp '"fadds s0, s0, s0"' - enabled neon && check_asm neon '"vadd.i16 q0, q0, q0"' - enabled vfpv3 && check_asm vfpv3 '"vmov.f32 s0, #1.0"' + enabled armv5te && check_inline_asm armv5te '"qadd r0, r0, r0"' + enabled armv6 && check_inline_asm armv6 '"sadd16 r0, r0, r0"' + enabled armv6t2 && check_inline_asm armv6t2 '"movt r0, #0"' + enabled armvfp && check_inline_asm armvfp '"fadds s0, s0, s0"' + enabled neon && check_inline_asm neon '"vadd.i16 q0, q0, q0"' + enabled vfpv3 && check_inline_asm vfpv3 '"vmov.f32 s0, #1.0"' - check_asm asm_mod_q '"add r0, %Q0, %R0" :: "r"((long long)0)' - check_asm asm_mod_y '"vmul.i32 d0, d0, %y0" :: "x"(0)' + check_inline_asm asm_mod_q '"add r0, %Q0, %R0" :: "r"((long long)0)' + check_inline_asm asm_mod_y '"vmul.i32 d0, d0, %y0" :: "x"(0)' enabled_all armv6t2 shared !pic && enable_pic elif enabled mips; then - check_asm loongson '"dmult.g $1, $2, $3"' - enabled mmi && check_asm mmi '"lq $2, 0($2)"' + check_inline_asm loongson '"dmult.g $1, $2, $3"' + enabled mmi && check_inline_asm mmi '"lq $2, 0($2)"' enabled mips32r2 && add_cflags "-mips32r2" && - check_asm mips32r2 '"rotr $t0, $t1, 1"' + check_inline_asm mips32r2 '"rotr $t0, $t1, 1"' enabled mipsdspr1 && add_cflags "-mdsp" && add_asflags "-mdsp" && - check_asm mipsdspr1 '"addu.qb $t0, $t1, $t2"' + check_inline_asm mipsdspr1 '"addu.qb $t0, $t1, $t2"' enabled mipsdspr2 && add_cflags "-mdspr2" && add_asflags "-mdspr2" && - check_asm mipsdspr2 '"absq_s.qb $t0, $t1"' + check_inline_asm mipsdspr2 '"absq_s.qb $t0, $t1"' enabled mipsfpu && add_cflags "-mhard-float" && - check_asm mipsfpu '"madd.d $f0, $f2, $f4, $f6"' - + check_inline_asm mipsfpu '"madd.d $f0, $f2, $f4, $f6"' elif enabled ppc; then enable local_aligned_8 local_aligned_16 - check_asm dcbzl '"dcbzl 0, %0" :: "r"(0)' - check_asm ibm_asm '"add 0, 0, 0"' - check_asm ppc4xx '"maclhw r10, r11, r12"' - check_asm xform_asm '"lwzx %1, %y0" :: "Z"(*(int*)0), "r"(0)' + check_inline_asm dcbzl '"dcbzl 0, %0" :: "r"(0)' + check_inline_asm ibm_asm '"add 0, 0, 0"' + check_inline_asm ppc4xx '"maclhw r10, r11, r12"' + check_inline_asm xform_asm '"lwzx %1, %y0" :: "Z"(*(int*)0), "r"(0)' # AltiVec flags: The FSF version of GCC differs from the Apple version if enabled altivec; then @@ -3184,7 +3183,8 @@ EOF elif enabled sparc; then - enabled vis && check_asm vis '"pdist %f0, %f0, %f0"' -mcpu=ultrasparc && + enabled vis && + check_inline_asm vis '"pdist %f0, %f0, %f0"' -mcpu=ultrasparc && add_cflags -mcpu=ultrasparc -mtune=ultrasparc elif enabled x86; then @@ -3211,15 +3211,15 @@ elif enabled x86; then EOF # check whether EBX is available on x86 - check_asm ebx_available '""::"b"(0)' && - check_asm ebx_available '"":::"%ebx"' + check_inline_asm ebx_available '""::"b"(0)' && + check_inline_asm ebx_available '"":::"%ebx"' # check whether xmm clobbers are supported - check_asm xmm_clobbers '"":::"%xmm0"' + check_inline_asm xmm_clobbers '"":::"%xmm0"' # check whether binutils is new enough to compile SSSE3/MMXEXT - enabled ssse3 && check_asm ssse3 '"pabsw %xmm0, %xmm0"' - enabled mmxext && check_asm mmxext '"pmaxub %mm0, %mm1"' + enabled ssse3 && check_inline_asm ssse3 '"pabsw %xmm0, %xmm0"' + enabled mmxext && check_inline_asm mmxext '"pmaxub %mm0, %mm1"' if ! disabled_any asm mmx yasm; then if check_cmd $yasmexe --version; then @@ -3255,7 +3255,7 @@ fi if enabled asm; then as=${gas:=$as} - check_asm gnu_as '".macro m n\n\\n:.int 0\n.endm\nm x"' || + check_inline_asm gnu_as '".macro m n\n\\n:.int 0\n.endm\nm x"' || $nogas "GNU assembler not found, install gas-preprocessor" fi |