diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2012-05-01 16:09:51 +0200 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2012-05-02 18:46:11 +0200 |
| commit | 0e23b508214611659fc459ed6e5d6704b907694b (patch) | |
| tree | 684887266cad85091af255f91b44d5d0f46255d7 /libavcodec | |
| parent | c8370e6e35e528a703b034824d0aad8fbe08c476 (diff) | |
| download | ffmpeg-0e23b508214611659fc459ed6e5d6704b907694b.tar.gz | |
wmall: fix reconstructing audio with uncoded channels
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/wmalosslessdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index e2e2997231..ff6308343e 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -654,8 +654,6 @@ static void mclms_predict(WmallDecodeCtx *s, int icoef, int *pred) int num_channels = s->num_channels; for (ich = 0; ich < num_channels; ich++) { - if (!s->is_channel_coded[ich]) - continue; pred[ich] = 0; for (i = 0; i < order * num_channels; i++) pred[ich] += s->mclms_prevvalues[i + s->mclms_recent] * @@ -789,7 +787,7 @@ static void revert_inter_ch_decorr(WmallDecodeCtx *s, int tile_size) { if (s->num_channels != 2) return; - else if (s->is_channel_coded[0] && s->is_channel_coded[1]) { + else if (s->is_channel_coded[0] || s->is_channel_coded[1]) { int icoef; for (icoef = 0; icoef < tile_size; icoef++) { s->channel_residues[0][icoef] -= s->channel_residues[1][icoef] >> 1; @@ -955,6 +953,8 @@ static int decode_subframe(WmallDecodeCtx *s) else use_normal_update_speed(s, i); revert_cdlms(s, i, 0, subframe_len); + } else { + memset(s->channel_residues[i], 0, sizeof(**s->channel_residues) * subframe_len); } } if (s->do_mclms) |