[FFmpeg-cvslog] Revert "alsdec: remove dead assignments"
Michael Niedermayer
git at videolan.org
Mon Jul 2 23:46:08 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 2 23:43:06 2012 +0200| [b2527d5d5a23127cb1676730a9210ea65cf82288] | committer: Michael Niedermayer
Revert "alsdec: remove dead assignments"
This reverts commit 4ca6d206d1b5beea42c4290d2ee801aaf5cd31f0.
The assignment is not dead, this should fix fate failures on BSD
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2527d5d5a23127cb1676730a9210ea65cf82288
---
libavcodec/alsdec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 1179b39..e5208fc 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -770,7 +770,7 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
int delta[8];
unsigned int k [8];
unsigned int b = av_clip((av_ceil_log2(bd->block_length) - 3) >> 1, 0, 5);
- unsigned int i;
+ unsigned int i = start;
// read most significant bits
unsigned int high;
@@ -781,7 +781,7 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
current_res = bd->raw_samples + start;
- for (sb = 0; sb < sub_blocks; sb++) {
+ for (sb = 0; sb < sub_blocks; sb++, i = 0) {
k [sb] = s[sb] > b ? s[sb] - b : 0;
delta[sb] = 5 - s[sb] + k[sb];
More information about the ffmpeg-cvslog
mailing list