diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 13:49:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 13:49:26 +0100 |
| commit | 7181806dc18062c5d1da760dcfdfbb99893b91cd (patch) | |
| tree | cb3c42d82e410eae7c1d19cc0f28d6e2ab5bfca8 | |
| parent | 8ee14aa5c7a283b09dbd3e82e21208c1aa1ab938 (diff) | |
| parent | 9ebd45c2d58ad9241ad09718679f0cf7fb57da52 (diff) | |
| download | ffmpeg-7181806dc18062c5d1da760dcfdfbb99893b91cd.tar.gz | |
Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'
* 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
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | libavcodec/arm/fft_fixed_init_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/dct-test.c | 6 | ||||
| -rw-r--r-- | libavcodec/snowenc.c | 1 |
4 files changed, 10 insertions, 10 deletions
@@ -2806,10 +2806,7 @@ is_in $arch $ARCH_LIST || warn "unknown architecture $arch" enable $arch # Add processor-specific flags -if test "$cpu" = generic; then - : do nothing - -elif enabled aarch64; then +if enabled aarch64; then case $cpu in armv*) @@ -2984,8 +2981,10 @@ elif enabled x86; then fi -add_cflags $cpuflags -add_asflags $cpuflags +if [ "$cpu" != generic ]; then + add_cflags $cpuflags + add_asflags $cpuflags +fi # compiler sanity check check_exec <<EOF diff --git a/libavcodec/arm/fft_fixed_init_arm.c b/libavcodec/arm/fft_fixed_init_arm.c index 7cf8a6ef36..59b933e5a0 100644 --- a/libavcodec/arm/fft_fixed_init_arm.c +++ b/libavcodec/arm/fft_fixed_init_arm.c @@ -36,7 +36,7 @@ av_cold void ff_fft_fixed_init_arm(FFTContext *s) s->fft_calc = ff_fft_fixed_calc_neon; #if CONFIG_MDCT - if (!s->inverse && s->mdct_bits >= 5) { + if (!s->inverse && s->nbits >= 3) { s->mdct_permutation = FF_MDCT_PERM_INTERLEAVE; s->mdct_calc = ff_mdct_fixed_calc_neon; s->mdct_calcw = ff_mdct_fixed_calcw_neon; diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 7727f0b1eb..2c43b36aa4 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -147,13 +147,13 @@ static const struct algo idct_tab[] = { { "INT-ARM", ff_j_rev_dct_arm, MMX_PERM }, #endif #if HAVE_ARMV5TE - { "SIMPLE-ARMV5TE", ff_simple_idct_armv5te,NO_PERM }, + { "SIMPLE-ARMV5TE", ff_simple_idct_armv5te,NO_PERM, AV_CPU_FLAG_ARMV5TE }, #endif #if HAVE_ARMV6 - { "SIMPLE-ARMV6", ff_simple_idct_armv6, MMX_PERM }, + { "SIMPLE-ARMV6", ff_simple_idct_armv6, MMX_PERM, AV_CPU_FLAG_ARMV6 }, #endif #if HAVE_NEON - { "SIMPLE-NEON", ff_simple_idct_neon, PARTTRANS_PERM }, + { "SIMPLE-NEON", ff_simple_idct_neon, PARTTRANS_PERM, AV_CPU_FLAG_NEON }, #endif #if ARCH_ALPHA diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 701a56d284..02c3aaab38 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -24,6 +24,7 @@ #include "avcodec.h" #include "internal.h" #include "dsputil.h" +#include "internal.h" #include "dwt.h" #include "snow.h" |