highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'

Browse Source 
* commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd':
  build: Add define for SIMD extensions requiring 16-byte aligned buffers

Conflicts:
	configure
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-22 22:32:40 +02:00
commit 1df2f7b6a8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -1582,6 +1582,7 @@ ARCH_FEATURES="
local_aligned_8 local_aligned_8
local_aligned_16 local_aligned_16
local_aligned_32 local_aligned_32
simd_align_16
" "
BUILTIN_LIST=" BUILTIN_LIST="
@ -1997,8 +1998,7 @@ aligned_stack_if_any="aarch64 ppc x86"
fast_64bit_if_any="aarch64 alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64" fast_64bit_if_any="aarch64 alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64"
fast_clz_if_any="aarch64 alpha avr32 mips ppc x86" fast_clz_if_any="aarch64 alpha avr32 mips ppc x86"
fast_unaligned_if_any="aarch64 ppc x86" fast_unaligned_if_any="aarch64 ppc x86"
simd_align_16_if_any="altivec neon sse"
need_memalign="altivec neon sse"
# system capabilities # system capabilities
@ -5191,7 +5191,7 @@ enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
enable dxva2_lib enable dxva2_lib
! enabled_any memalign posix_memalign aligned_malloc && ! enabled_any memalign posix_memalign aligned_malloc &&
enabled_any $need_memalign && enable memalign_hack enabled $simd_align_16 && enable memalign_hack
# add_dep lib dep # add_dep lib dep
# -> enable ${lib}_deps_${dep} # -> enable ${lib}_deps_${dep}

2
libavcodec/internal.h
View File

@ -37,7 +37,7 @@
#if HAVE_AVX #if HAVE_AVX
# define STRIDE_ALIGN 32 # define STRIDE_ALIGN 32
#elif HAVE_NEON || ARCH_PPC || HAVE_MMX #elif HAVE_SIMD_ALIGN_16
# define STRIDE_ALIGN 16 # define STRIDE_ALIGN 16
#else #else
# define STRIDE_ALIGN 8 # define STRIDE_ALIGN 8