RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'

Browse Source 
* 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 594d4d5df3
  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>
This commit is contained in:
Michael Niedermayer 2012-12-08 13:49:26 +01:00
commit 7181806dc1
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -2806,10 +2806,7 @@ is_in $arch $ARCH_LIST || warn "unknown architecture $arch"
enable $arch enable $arch
# Add processor-specific flags # Add processor-specific flags
if test "$cpu" = generic; then if enabled aarch64; then
: do nothing
elif enabled aarch64; then
case $cpu in case $cpu in
armv*) armv*)
@ -2984,8 +2981,10 @@ elif enabled x86; then
fi fi
add_cflags $cpuflags if [ "$cpu" != generic ]; then
add_asflags $cpuflags add_cflags $cpuflags
add_asflags $cpuflags
fi
# compiler sanity check # compiler sanity check
check_exec <<EOF check_exec <<EOF

2
libavcodec/arm/fft_fixed_init_arm.c
View File

@ -36,7 +36,7 @@ av_cold void ff_fft_fixed_init_arm(FFTContext *s)
s->fft_calc = ff_fft_fixed_calc_neon; s->fft_calc = ff_fft_fixed_calc_neon;
#if CONFIG_MDCT #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_permutation = FF_MDCT_PERM_INTERLEAVE;
s->mdct_calc = ff_mdct_fixed_calc_neon; s->mdct_calc = ff_mdct_fixed_calc_neon;
s->mdct_calcw = ff_mdct_fixed_calcw_neon; s->mdct_calcw = ff_mdct_fixed_calcw_neon;

6
libavcodec/dct-test.c
View File

@ -147,13 +147,13 @@ static const struct algo idct_tab[] = {
{ "INT-ARM", ff_j_rev_dct_arm, MMX_PERM }, { "INT-ARM", ff_j_rev_dct_arm, MMX_PERM },
#endif #endif
#if HAVE_ARMV5TE #if HAVE_ARMV5TE
{ "SIMPLE-ARMV5TE", ff_simple_idct_armv5te,NO_PERM }, { "SIMPLE-ARMV5TE", ff_simple_idct_armv5te,NO_PERM, AV_CPU_FLAG_ARMV5TE },
#endif #endif
#if HAVE_ARMV6 #if HAVE_ARMV6
{ "SIMPLE-ARMV6", ff_simple_idct_armv6, MMX_PERM }, { "SIMPLE-ARMV6", ff_simple_idct_armv6, MMX_PERM, AV_CPU_FLAG_ARMV6 },
#endif #endif
#if HAVE_NEON #if HAVE_NEON
{ "SIMPLE-NEON", ff_simple_idct_neon, PARTTRANS_PERM }, { "SIMPLE-NEON", ff_simple_idct_neon, PARTTRANS_PERM, AV_CPU_FLAG_NEON },
#endif #endif
#if ARCH_ALPHA #if ARCH_ALPHA

1
libavcodec/snowenc.c
View File

@ -24,6 +24,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "dsputil.h" #include "dsputil.h"
#include "internal.h"
#include "dwt.h" #include "dwt.h"
#include "snow.h" #include "snow.h"