virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

Merge commit '10f4511f14a4e830c0ed471df4cd1cc2a18a481a'

Browse Source 
* commit '10f4511f14a4e830c0ed471df4cd1cc2a18a481a':
  libavutil: Make LOCAL_ALIGNED(xx be equal to LOCAL_ALIGNED_xx(

Also added LOCAL_ALIGNED_4 as it's used in vp8 decoder, and
simplified the configure defines.

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-26 14:06:34 -03:00
commit 5de85c1029
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -1881,9 +1881,7 @@ ARCH_FEATURES="
fast_64bit fast_64bit
fast_clz fast_clz
fast_cmov fast_cmov
local_aligned_8 local_aligned
local_aligned_16
local_aligned_32
simd_align_16 simd_align_16
simd_align_32 simd_align_32
" "
@ -4682,7 +4680,7 @@ elif enabled mips; then
loongson*) loongson*)
enable loongson2 enable loongson2
enable loongson3 enable loongson3
enable local_aligned_8 local_aligned_16 local_aligned_32 enable local_aligned
enable simd_align_16 enable simd_align_16
enable fast_64bit enable fast_64bit
enable fast_clz enable fast_clz
@ -5574,7 +5572,7 @@ elif enabled parisc; then
elif enabled ppc; then elif enabled ppc; then
enable local_aligned_8 local_aligned_16 local_aligned_32 enable local_aligned
check_inline_asm dcbzl '"dcbzl 0, %0" :: "r"(0)' check_inline_asm dcbzl '"dcbzl 0, %0" :: "r"(0)'
check_inline_asm ibm_asm '"add 0, 0, 0"' check_inline_asm ibm_asm '"add 0, 0, 0"'
@ -5615,7 +5613,7 @@ elif enabled x86; then
check_builtin rdtsc intrin.h "__rdtsc()" check_builtin rdtsc intrin.h "__rdtsc()"
check_builtin mm_empty mmintrin.h "_mm_empty()" check_builtin mm_empty mmintrin.h "_mm_empty()"
enable local_aligned_8 local_aligned_16 local_aligned_32 enable local_aligned
# check whether EBP is available on x86 # check whether EBP is available on x86
# As 'i' is stored on the stack, this program will crash # As 'i' is stored on the stack, this program will crash

21
libavutil/internal.h
View File

@ -43,6 +43,7 @@
#include "cpu.h" #include "cpu.h"
#include "dict.h" #include "dict.h"
#include "macros.h" #include "macros.h"
#include "mem.h"
#include "pixfmt.h" #include "pixfmt.h"
#include "version.h" #include "version.h"
@ -110,24 +111,30 @@
DECLARE_ALIGNED(a, t, la_##v) s o; \ DECLARE_ALIGNED(a, t, la_##v) s o; \
t (*v) o = la_##v t (*v) o = la_##v
#define LOCAL_ALIGNED(a, t, v, ...) E1(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,)) #define LOCAL_ALIGNED(a, t, v, ...) LOCAL_ALIGNED_##a(t, v, __VA_ARGS__)
#if HAVE_LOCAL_ALIGNED_8 #if HAVE_LOCAL_ALIGNED
# define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,))
#else
# define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_A(4, t, v, __VA_ARGS__,,))
#endif
#if HAVE_LOCAL_ALIGNED
# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) # define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,))
#else #else
# define LOCAL_ALIGNED_8(t, v, ...) LOCAL_ALIGNED(8, t, v, __VA_ARGS__) # define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_A(8, t, v, __VA_ARGS__,,))
#endif #endif
#if HAVE_LOCAL_ALIGNED_16 #if HAVE_LOCAL_ALIGNED
# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) # define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,))
#else #else
# define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__) # define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_A(16, t, v, __VA_ARGS__,,))
#endif #endif
#if HAVE_LOCAL_ALIGNED_32 #if HAVE_LOCAL_ALIGNED
# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,)) # define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,))
#else #else
# define LOCAL_ALIGNED_32(t, v, ...) LOCAL_ALIGNED(32, t, v, __VA_ARGS__) # define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,))
#endif #endif
#define FF_ALLOC_OR_GOTO(ctx, p, size, label)\ #define FF_ALLOC_OR_GOTO(ctx, p, size, label)\