Module: libav
Branch: master
Commit: 92dad6687f59a6e599834218626e524eb8a5bdae

Author:    Mans Rullgard <[email protected]>
Committer: Mans Rullgard <[email protected]>
Date:      Thu Dec  6 23:51:01 2012 +0000

arm: fix use of uninitialised value in ff_fft_fixed_init_arm()

When initialising an FFTContext for a plain FFT, mdct_bits is not set
and can contain a garbage value.  Since nbits is always valid and for
MDCT operation is mdct_bits - 2 checking this instead avoids using an
uninitialised value while having the same effect.

Signed-off-by: Mans Rullgard <[email protected]>

---

 libavcodec/arm/fft_fixed_init_arm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/arm/fft_fixed_init_arm.c 
b/libavcodec/arm/fft_fixed_init_arm.c
index 5601ba1..50532f2 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;

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to