[SCM] libav/experimental: imdct/x86: Use "s->mdct_size" instead of "1 << s->mdct_bits".

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit cb4f12466b85921dac9076c3cc7350eff9cd8067
Author: Alex Converse <alex.converse at gmail.com>
Date:   Mon Aug 23 15:51:09 2010 +0000

    imdct/x86: Use "s->mdct_size" instead of "1 << s->mdct_bits".
    
    It generates smaller cleaner code.
    
    Originally committed as revision 24887 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/x86/fft_3dn2.c b/libavcodec/x86/fft_3dn2.c
index b3bec46..2abb8cf 100644
--- a/libavcodec/x86/fft_3dn2.c
+++ b/libavcodec/x86/fft_3dn2.c
@@ -56,7 +56,7 @@ void ff_fft_calc_3dn2(FFTContext *s, FFTComplex *z)
 void ff_imdct_half_3dn2(FFTContext *s, FFTSample *output, const FFTSample *input)
 {
     x86_reg j, k;
-    long n = 1 << s->mdct_bits;
+    long n = s->mdct_size;
     long n2 = n >> 1;
     long n4 = n >> 2;
     long n8 = n >> 3;
@@ -147,7 +147,7 @@ void ff_imdct_half_3dn2(FFTContext *s, FFTSample *output, const FFTSample *input
 void ff_imdct_calc_3dn2(FFTContext *s, FFTSample *output, const FFTSample *input)
 {
     x86_reg j, k;
-    long n = 1 << s->mdct_bits;
+    long n = s->mdct_size;
     long n4 = n >> 2;
 
     ff_imdct_half_3dn2(s, output+n4, input);
diff --git a/libavcodec/x86/fft_sse.c b/libavcodec/x86/fft_sse.c
index 92648b5..0908671 100644
--- a/libavcodec/x86/fft_sse.c
+++ b/libavcodec/x86/fft_sse.c
@@ -74,7 +74,7 @@ void ff_fft_permute_sse(FFTContext *s, FFTComplex *z)
 void ff_imdct_calc_sse(FFTContext *s, FFTSample *output, const FFTSample *input)
 {
     x86_reg j, k;
-    long n = 1 << s->mdct_bits;
+    long n = s->mdct_size;
     long n4 = n >> 2;
 
     ff_imdct_half_sse(s, output+n4, input);

-- 
Libav/FFmpeg packaging