diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:58:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:58:56 +0100 |
| commit | 57cee850238488a6088085ae078af17f04f2198a (patch) | |
| tree | 9551a690983609d59e91e3c63ae4b15114eecb34 /configure | |
| parent | 7efee140d7d6fe197a73a178314eacd330a8cc77 (diff) | |
| parent | 096abfa15052977eed93f0b5e01afd2d47c53c1f (diff) | |
| download | ffmpeg-57cee850238488a6088085ae078af17f04f2198a.tar.gz | |
Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'
* commit '096abfa15052977eed93f0b5e01afd2d47c53c1f':
parser: fix large overreads
bitstream: add get_bits64() to support reading more than 32 bits at once
arm: detect cpu features at runtime on Linux
Conflicts:
libavcodec/parser.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -3497,7 +3497,9 @@ EOF enabled vfp && check_insn vfp 'fadds s0, s0, s0' enabled vfpv3 && check_insn vfpv3 'vmov.f32 s0, #1.0' - map 'enabled_any ${v}_external ${v}_inline || disable $v' $ARCH_EXT_LIST_ARM + [ $target_os = linux ] || + map 'enabled_any ${v}_external ${v}_inline || disable $v' \ + $ARCH_EXT_LIST_ARM 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)' |