OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a08efa2
)
Revert "alsdec: remove dead assignments"
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 2 Jul 2012 21:43:06 +0000
(23:43 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 2 Jul 2012 21:43:06 +0000
(23:43 +0200)
This reverts commit
4ca6d206d1b5beea42c4290d2ee801aaf5cd31f0
.
The assignment is not dead, this should fix fate failures on BSD
libavcodec/alsdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/alsdec.c
b/libavcodec/alsdec.c
index
1179b39
..
e5208fc
100644
(file)
--- 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];