diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-11-22 13:37:52 -0500 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-12-23 22:27:02 +0100 |
| commit | 8dba5608dcf76032d8a9aa4bd8a3fc1392682281 (patch) | |
| tree | 4fcf1a96f9138f15b3c376385cbe016af2d79b9c | |
| parent | 7ce728050b6157fc926bc399393d8c1161c9efd6 (diff) | |
| download | ffmpeg-8dba5608dcf76032d8a9aa4bd8a3fc1392682281.tar.gz | |
wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
The initial values are not checked against the number of block sizes.
Initializing them to frame_len_bits will result in a block size index of 0
in these cases instead of something that might be out-of-range.
Fixes Bug 81.
(cherry picked from commit 05d1e45d1f42cc90d1f2f36c546d0096cea126a8)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/wma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c index bed47ec35b..4cdffcd101 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -137,6 +137,9 @@ int ff_wma_init(AVCodecContext *avctx, int flags2) /* compute MDCT block size */ s->frame_len_bits = ff_wma_get_frame_len_bits(s->sample_rate, s->version, 0); + s->next_block_len_bits = s->frame_len_bits; + s->prev_block_len_bits = s->frame_len_bits; + s->block_len_bits = s->frame_len_bits; s->frame_len = 1 << s->frame_len_bits; if (s->use_variable_block_len) { |