diff options
author | William Wilgus <wilgus.william@gmail.com> | 2021-03-02 19:47:07 -0500 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2021-03-02 19:47:07 -0500 |
commit | 118191479d95793d9b13d9f63058490c30366260 (patch) | |
tree | db6236c12b059192c8b451f7c54addca50089686 | |
parent | 2252bde144262cd37557a96182cf6b94116608d6 (diff) | |
download | rockbox-118191479d95793d9b13d9f63058490c30366260.tar.gz rockbox-118191479d95793d9b13d9f63058490c30366260.zip |
Nudge flac towards upstream FS#13266 -- Fix the Yellow still?
Change-Id: I76056b1a682db055857d759d2ebffae111a8a4c0
-rw-r--r-- | lib/rbcodec/codecs/libffmpegFLAC/decoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/libffmpegFLAC/decoder.c b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c index b3cd79b6c5..c84973014f 100644 --- a/lib/rbcodec/codecs/libffmpegFLAC/decoder.c +++ b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c | |||
@@ -302,9 +302,9 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order, | |||
302 | return -7; | 302 | return -7; |
303 | } | 303 | } |
304 | 304 | ||
305 | for (i = 0; i < pred_order; i++) | 305 | for (j = 0; i < pred_order; j++) |
306 | { | 306 | { |
307 | coeffs[i] = get_sbits(&s->gb, coeff_prec); | 307 | coeffs[j] = get_sbits(&s->gb, coeff_prec); |
308 | } | 308 | } |
309 | 309 | ||
310 | if (decode_residuals(s, decoded, pred_order) < 0) | 310 | if (decode_residuals(s, decoded, pred_order) < 0) |
@@ -312,11 +312,11 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order, | |||
312 | 312 | ||
313 | if ((s->bps + coeff_prec + av_log2(pred_order)) <= 32) { | 313 | if ((s->bps + coeff_prec + av_log2(pred_order)) <= 32) { |
314 | #if defined(CPU_COLDFIRE) | 314 | #if defined(CPU_COLDFIRE) |
315 | (void)sum, j; | 315 | (void)sum; |
316 | lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, | 316 | lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, |
317 | decoded + pred_order, coeffs); | 317 | decoded + pred_order, coeffs); |
318 | #elif defined(CPU_ARM) | 318 | #elif defined(CPU_ARM) |
319 | (void)sum, j; | 319 | (void)sum; |
320 | lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order, | 320 | lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order, |
321 | decoded + pred_order, coeffs); | 321 | decoded + pred_order, coeffs); |
322 | #else | 322 | #else |