* commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52': configure: do not bypass cpuflags section if --cpu not given dct-test: arm: indicate required cpu features for optimised funcs snow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793 arm: fix use of uninitialised value in ff_fft_fixed_init_arm() avpicture: Don't assume a valid pix fmt in avpicture_get_size Conflicts: libavcodec/avpicture.c libavcodec/snow.c
Unified · Split
| @@ -2806,10 +2806,7 @@ is_in $arch $ARCH_LIST || warn "unknown architecture $arch" · 2805 unmodified lines | |||
| 2806 | enable $arch | 2806 | enable $arch |
| 2807 | 2807 | ||
| 2808 | # Add processor-specific flags | 2808 | # Add processor-specific flags |
| 2809 | if test "$cpu" = generic; then | 2809 | if enabled aarch64; then |
| 2810 | : do nothing | ||
| 2811 | |||
| 2812 | elif enabled aarch64; then | ||
| 2813 | 2810 | ||
| 2814 | case $cpu in | 2811 | case $cpu in |
| 2815 | armv*) | 2812 | armv*) |
| @@ -2984,8 +2981,10 @@ elif enabled x86; then · 168 unmodified lines | |||
| 2984 | 2981 | ||
| 2985 | fi | 2982 | fi |
| 2986 | 2983 | ||
| 2987 | add_cflags $cpuflags | 2984 | if [ "$cpu" != generic ]; then |
| 2988 | add_asflags $cpuflags | 2985 | add_cflags $cpuflags |
| 2986 | add_asflags $cpuflags | ||
| 2987 | fi | ||
| 2989 | 2988 | ||
| 2990 | # compiler sanity check | 2989 | # compiler sanity check |
| 2991 | check_exec <<EOF | 2990 | check_exec <<EOF |
| @@ -36,7 +36,7 @@ av_cold void ff_fft_fixed_init_arm(FFTContext *s) · 35 unmodified lines | |||
| 36 | s->fft_calc = ff_fft_fixed_calc_neon; | 36 | s->fft_calc = ff_fft_fixed_calc_neon; |
| 37 | 37 | ||
| 38 | #if CONFIG_MDCT | 38 | #if CONFIG_MDCT |
| 39 | if (!s->inverse && s->mdct_bits >= 5) { | 39 | if (!s->inverse && s->nbits >= 3) { |
| 40 | s->mdct_permutation = FF_MDCT_PERM_INTERLEAVE; | 40 | s->mdct_permutation = FF_MDCT_PERM_INTERLEAVE; |
| 41 | s->mdct_calc = ff_mdct_fixed_calc_neon; | 41 | s->mdct_calc = ff_mdct_fixed_calc_neon; |
| 42 | s->mdct_calcw = ff_mdct_fixed_calcw_neon; | 42 | s->mdct_calcw = ff_mdct_fixed_calcw_neon; |
| @@ -147,13 +147,13 @@ static const struct algo idct_tab[] = { · 146 unmodified lines | |||
| 147 | { "INT-ARM", ff_j_rev_dct_arm, MMX_PERM }, | 147 | { "INT-ARM", ff_j_rev_dct_arm, MMX_PERM }, |
| 148 | #endif | 148 | #endif |
| 149 | #if HAVE_ARMV5TE | 149 | #if HAVE_ARMV5TE |
| 150 | { "SIMPLE-ARMV5TE", ff_simple_idct_armv5te,NO_PERM }, | 150 | { "SIMPLE-ARMV5TE", ff_simple_idct_armv5te,NO_PERM, AV_CPU_FLAG_ARMV5TE }, |
| 151 | #endif | 151 | #endif |
| 152 | #if HAVE_ARMV6 | 152 | #if HAVE_ARMV6 |
| 153 | { "SIMPLE-ARMV6", ff_simple_idct_armv6, MMX_PERM }, | 153 | { "SIMPLE-ARMV6", ff_simple_idct_armv6, MMX_PERM, AV_CPU_FLAG_ARMV6 }, |
| 154 | #endif | 154 | #endif |
| 155 | #if HAVE_NEON | 155 | #if HAVE_NEON |
| 156 | { "SIMPLE-NEON", ff_simple_idct_neon, PARTTRANS_PERM }, | 156 | { "SIMPLE-NEON", ff_simple_idct_neon, PARTTRANS_PERM, AV_CPU_FLAG_NEON }, |
| 157 | #endif | 157 | #endif |
| 158 | 158 | ||
| 159 | #if ARCH_ALPHA | 159 | #if ARCH_ALPHA |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 25 | #include "internal.h" | 25 | #include "internal.h" |
| 26 | #include "dsputil.h" | 26 | #include "dsputil.h" |
| 27 | #include "internal.h" | ||
| 27 | #include "dwt.h" | 28 | #include "dwt.h" |
| 28 | #include "snow.h" | 29 | #include "snow.h" |
| 29 | 30 | ||