Use shared sine window instead of defining another one.

Originally committed as revision 16657 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index dfbb41caf4fcb0387ee472e08263adc31bb5e45e..c0a856e2ac422ef1369f32499d68946fb9863b6f 100644 (file)
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -53,8 +53,6 @@ typedef struct NellyMoserDecodeContext {
     DECLARE_ALIGNED_16(float,imdct_out[NELLY_BUF_LEN * 2]);
 } NellyMoserDecodeContext;
 
-static DECLARE_ALIGNED_16(float,sine_window[128]);
-
 static void overlap_and_window(NellyMoserDecodeContext *s, float *state, float *audio, float *a_in)
 {
     int bot, top;
@@ -63,8 +61,8 @@ static void overlap_and_window(NellyMoserDecodeContext *s, float *state, float *
     top = NELLY_BUF_LEN-1;
 
     while (bot < NELLY_BUF_LEN) {
-        audio[bot] = a_in [bot]*sine_window[bot]
-                    +state[bot]*sine_window[top] + s->add_bias;
+        audio[bot] = a_in [bot]*ff_sine_128[bot]
+                    +state[bot]*ff_sine_128[top] + s->add_bias;
 
         bot++;
         top--;
@@ -144,8 +142,8 @@ static av_cold int decode_init(AVCodecContext * avctx) {
     }
 
     /* Generate overlap window */
-    if (!sine_window[0])
-        ff_sine_window_init(sine_window, 128);
+    if (!ff_sine_128[127])
+        ff_sine_window_init(ff_sine_128, 128);
 
     avctx->sample_fmt = SAMPLE_FMT_S16;
     avctx->channel_layout = CH_LAYOUT_MONO;