diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 21:41:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 21:41:19 +0100 |
| commit | fb3c33f3cd6b932badbe61a3e0d5cce9f4e36769 (patch) | |
| tree | 1752b2b23e6f7058133bf844b6c783153350613f /configure | |
| parent | ffb7d7195be6a4f25e81600a2a6a6dadd2a11e18 (diff) | |
| parent | 4cb6964244fd6c099383d8b7e99731e72cc844b9 (diff) | |
| download | ffmpeg-fb3c33f3cd6b932badbe61a3e0d5cce9f4e36769.tar.gz | |
Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'
* commit '4cb6964244fd6c099383d8b7e99731e72cc844b9':
dcadec: simplify decoding of VQ high frequencies
Conflicts:
configure
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1540,7 +1540,6 @@ HAVE_LIST=" altivec_h arpa_inet_h asm_mod_q - asm_mod_y asm_types_h atomic_cas_ptr atomics_native @@ -4147,7 +4146,6 @@ EOF $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)' [ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic |