History

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

Michael Niedermayer committed 13 years ago

Commit 71818062 parents 8ee14aa 9ebd45c4 files · +10 −10Browse files

Showing the changes to libavcodec/arm (1 of 4 files). Show all

Unified · Split

libavcodec/arm/fft_fixed_init_arm.c+1−1
@@ -36,7 +36,7 @@ av_cold void ff_fft_fixed_init_arm(FFTContext *s) · 35 unmodified lines
3636 s->fft_calc = ff_fft_fixed_calc_neon;
3737
3838 #if CONFIG_MDCT
39− if (!s->inverse && s->mdct_bits >= 5) {
39+ if (!s->inverse && s->nbits >= 3) {
4040 s->mdct_permutation = FF_MDCT_PERM_INTERLEAVE;
4141 s->mdct_calc = ff_mdct_fixed_calc_neon;
4242 s->mdct_calcw = ff_mdct_fixed_calcw_neon;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t