[FFmpeg-cvslog] Merge commit '89aebc5bcc6e23a0a79c3f51c3a55c3571692ba0'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Mar 15 22:16:53 2017 -0300| [6c4665deb4d20e3e305e54b4fb4431e57497d374] | committer: James Almer

Merge commit '89aebc5bcc6e23a0a79c3f51c3a55c3571692ba0'

* commit '89aebc5bcc6e23a0a79c3f51c3a55c3571692ba0':
  lavc: align the linesize to 32 when AVX is enabled

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c4665deb4d20e3e305e54b4fb4431e57497d374
---

 configure             | 6 +++++-
 libavcodec/internal.h | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index ecf67d5..0333210 100755
--- a/configure
+++ b/configure
@@ -1835,7 +1835,9 @@ ARCH_FEATURES="
     local_aligned_8
     local_aligned_16
     local_aligned_32
+    simd_align
     simd_align_16
+    simd_align_32
 "
 
 BUILTIN_LIST="
@@ -2333,7 +2335,9 @@ aligned_stack_if_any="aarch64 ppc x86"
 fast_64bit_if_any="aarch64 alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64"
 fast_clz_if_any="aarch64 alpha avr32 mips ppc x86"
 fast_unaligned_if_any="aarch64 ppc x86"
+simd_align_if_any="simd_align_16 simd_align_32"
 simd_align_16_if_any="altivec neon sse"
+simd_align_32_if_any="avx"
 
 # system capabilities
 symver_if_any="symver_asm_label symver_gnu_asm"
@@ -6405,7 +6409,7 @@ enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
     enable dxva2_lib
 
 ! enabled_any memalign posix_memalign aligned_malloc &&
-    enabled simd_align_16 && enable memalign_hack
+    enabled simd_align && enable memalign_hack
 
 # add_dep lib dep
 # -> enable ${lib}_deps_${dep}
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index e3286d2..d6e620a 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -74,7 +74,7 @@
 
 #define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1)
 
-#if HAVE_AVX
+#if HAVE_SIMD_ALIGN_32
 #   define STRIDE_ALIGN 32
 #elif HAVE_SIMD_ALIGN_16
 #   define STRIDE_ALIGN 16


======================================================================

diff --cc configure
index ecf67d5,9f836b7..0333210
--- a/configure
+++ b/configure
@@@ -6405,35 -5036,8 +6409,35 @@@ enabled_all dxva2 dxva2api_cobj CoTaskM
      enable dxva2_lib
  
  ! enabled_any memalign posix_memalign aligned_malloc &&
-     enabled simd_align_16 && enable memalign_hack
+     enabled simd_align && enable memalign_hack
  
 +# add_dep lib dep
 +# -> enable ${lib}_deps_${dep}
 +# -> add $dep to ${lib}_deps only once
 +add_dep() {
 +    lib=$1
 +    dep=$2
 +    enabled "${lib}_deps_${dep}" && return 0
 +    enable  "${lib}_deps_${dep}"
 +    prepend "${lib}_deps" $dep
 +}
 +
 +# merge deps lib components
 +# merge all ${component}_deps into ${lib}_deps and ${lib}_deps_*
 +merge_deps() {
 +    lib=$1
 +    shift
 +    for comp in $*; do
 +        enabled $comp || continue
 +        eval "dep=\"\$${comp}_deps\""
 +        for d in $dep; do
 +            add_dep $lib $d
 +        done
 +    done
 +}
 +
 +merge_deps libavfilter $FILTER_LIST
 +
  map 'enabled $v && intrinsics=${v#intrinsics_}' $INTRINSICS_LIST
  
  for thread in $THREADS_LIST; do
diff --cc libavcodec/internal.h
index e3286d2,4bde09a..d6e620a
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@@ -70,17 -71,9 +70,17 @@@
  #define FF_DEFAULT_QUANT_BIAS 999999
  #endif
  
 -#define FF_SANE_NB_CHANNELS 63U
 +#define FF_SANE_NB_CHANNELS 64U
  
 -#define FF_SIGNBIT(x) (x >> CHAR_BIT * sizeof(x) - 1)
 +#define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1)
 +
- #if HAVE_AVX
++#if HAVE_SIMD_ALIGN_32
 +#   define STRIDE_ALIGN 32
 +#elif HAVE_SIMD_ALIGN_16
 +#   define STRIDE_ALIGN 16
 +#else
 +#   define STRIDE_ALIGN 8
 +#endif
  
  typedef struct FramePool {
      /**