ffmpeg source update for sep 09

source/patched-ffmpeg-mt/libavcodec/wmavoice.c

 /*
  * Windows Media Audio Voice decoder.
  * Copyright (c) 2009 Ronald S. Bultje
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
@@ skipping 1015 matching lines @@
 /**
  * Apply second set of pitch-adaptive window pulses.
  * @param s WMA Voice decoding context private data
  * @param gb bit I/O context
  * @param block_idx block index in frame [0, 1]
  * @param fcb structure containing fixed codebook vector info
  */
 static void aw_pulse_set2(WMAVoiceContext *s, GetBitContext *gb,
                           int block_idx, AMRFixed *fcb)
 {
-    uint16_t use_mask[7]; // only 5 are used, rest is padding
+    uint16_t use_mask_mem[9]; // only 5 are used, rest is padding
+    uint16_t *use_mask = use_mask_mem + 2;
     /* in this function, idx is the index in the 80-bit (+ padding) use_mask
      * bit-array. Since use_mask consists of 16-bit values, the lower 4 bits
      * of idx are the position of the bit within a particular item in the
      * array (0 being the most significant bit, and 15 being the least
      * significant bit), and the remainder (>> 4) is the index in the
      * use_mask[]-array. This is faster and uses less memory than using a
      * 80-byte/80-int array. */
     int pulse_off = s->aw_first_pulse_off[block_idx],
         pulse_start, n, idx, range, aidx, start_off = 0;
 
@@ skipping 11 matching lines @@
             if (s->aw_n_pulses[block_idx] > 0)
                 pulse_off = s->aw_next_pulse_off_cache;
         }
     } else
         range = 16;
     pulse_start = s->aw_n_pulses[block_idx] > 0 ? pulse_off - range / 2 : 0;
 
     /* aw_pulse_set1() already applies pulses around pulse_off (to be exactly,
      * in the range of [pulse_off, pulse_off + s->aw_pulse_range], and thus
      * we exclude that range from being pulsed again in this function. */
+    memset(&use_mask[-2], 0, 2 * sizeof(use_mask[0]));
     memset( use_mask,   -1, 5 * sizeof(use_mask[0]));
     memset(&use_mask[5], 0, 2 * sizeof(use_mask[0]));
     if (s->aw_n_pulses[block_idx] > 0)
         for (idx = pulse_off; idx < MAX_FRAMESIZE / 2; idx += fcb->pitch_lag) {
             int excl_range         = s->aw_pulse_range; // always 16 or 24
             uint16_t *use_mask_ptr = &use_mask[idx >> 4];
             int first_sh           = 16 - (idx & 15);
             *use_mask_ptr++       &= 0xFFFF << first_sh;
             excl_range            -= first_sh;
             if (excl_range >= 16) {
@@ skipping 944 matching lines @@
     CODEC_ID_WMAVOICE,
     sizeof(WMAVoiceContext),
     wmavoice_decode_init,
     NULL,
     wmavoice_decode_end,
     wmavoice_decode_packet,
     CODEC_CAP_SUBFRAMES,
     .flush     = wmavoice_flush,
     .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"),
 };