[FFmpeg-cvslog] wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.

Justin Ruggles git at videolan.org
Sun Dec 25 01:36:04 CET 2011


ffmpeg | branch: release/0.6 | Justin Ruggles <justin.ruggles at gmail.com> | Tue Nov 22 13:37:52 2011 -0500| [92b964969b228799fded70827d8b78044aff5019] | committer: Reinhard Tartler

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 at tauware.de>
(cherry picked from commit 8dba5608dcf76032d8a9aa4bd8a3fc1392682281)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92b964969b228799fded70827d8b78044aff5019
---

 libavcodec/wma.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index 6578045..45d431a 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -135,6 +135,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) {



More information about the ffmpeg-cvslog mailing list