dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-08-04 23:20:40 +00:00
Code Issues Packages 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
parent 8ee14aa5c7 9ebd45c2d5
commit 7181806dc1
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
#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;