diff options
Diffstat (limited to 'src/libFLAC/stream_decoder.c')
| -rw-r--r-- | src/libFLAC/stream_decoder.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c index 83409ed7..09bdadaa 100644 --- a/src/libFLAC/stream_decoder.c +++ b/src/libFLAC/stream_decoder.c @@ -2747,7 +2747,8 @@ FLAC__bool read_subframe_fixed_(FLAC__StreamDecoder *decoder, uint32_t channel, /* decode the subframe */ if(do_full_decode) { if(bps < 33){ - for(uint32_t i = 0; i < order; i++) + uint32_t i; + for(i = 0; i < order; i++) decoder->private_->output[channel][i] = subframe->warmup[i]; if(bps+order <= 32) FLAC__fixed_restore_signal(decoder->private_->residual[channel], decoder->private_->frame.header.blocksize-order, order, decoder->private_->output[channel]+order); @@ -2849,7 +2850,8 @@ FLAC__bool read_subframe_lpc_(FLAC__StreamDecoder *decoder, uint32_t channel, ui /* decode the subframe */ if(do_full_decode) { if(bps <= 32) { - for(uint32_t i = 0; i < order; i++) + uint32_t i; + for(i = 0; i < order; i++) decoder->private_->output[channel][i] = subframe->warmup[i]; if(FLAC__lpc_max_residual_bps(bps, subframe->qlp_coeff, order, subframe->quantization_level) <= 32 && FLAC__lpc_max_prediction_before_shift_bps(bps, subframe->qlp_coeff, order) <= 32) @@ -3072,6 +3074,7 @@ FLAC__bool read_callback_(FLAC__byte buffer[], size_t *bytes, void *client_data) __attribute__((no_sanitize("signed-integer-overflow"))) #endif void undo_channel_coding(FLAC__StreamDecoder *decoder) { + uint32_t i; switch(decoder->private_->frame.header.channel_assignment) { case FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT: /* do nothing */ @@ -3079,7 +3082,7 @@ void undo_channel_coding(FLAC__StreamDecoder *decoder) { case FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE: FLAC__ASSERT(decoder->private_->frame.header.channels == 2); FLAC__ASSERT(decoder->private_->side_subframe_in_use != /* logical XOR */ (decoder->private_->frame.header.bits_per_sample < 32)); - for(uint32_t i = 0; i < decoder->private_->frame.header.blocksize; i++) + for(i = 0; i < decoder->private_->frame.header.blocksize; i++) if(decoder->private_->side_subframe_in_use) decoder->private_->output[1][i] = decoder->private_->output[0][i] - decoder->private_->side_subframe[i]; else @@ -3088,7 +3091,7 @@ void undo_channel_coding(FLAC__StreamDecoder *decoder) { case FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE: FLAC__ASSERT(decoder->private_->frame.header.channels == 2); FLAC__ASSERT(decoder->private_->side_subframe_in_use != /* logical XOR */ (decoder->private_->frame.header.bits_per_sample < 32)); - for(uint32_t i = 0; i < decoder->private_->frame.header.blocksize; i++) + for(i = 0; i < decoder->private_->frame.header.blocksize; i++) if(decoder->private_->side_subframe_in_use) decoder->private_->output[0][i] = decoder->private_->output[1][i] + decoder->private_->side_subframe[i]; else @@ -3097,7 +3100,7 @@ void undo_channel_coding(FLAC__StreamDecoder *decoder) { case FLAC__CHANNEL_ASSIGNMENT_MID_SIDE: FLAC__ASSERT(decoder->private_->frame.header.channels == 2); FLAC__ASSERT(decoder->private_->side_subframe_in_use != /* logical XOR */ (decoder->private_->frame.header.bits_per_sample < 32)); - for(uint32_t i = 0; i < decoder->private_->frame.header.blocksize; i++) { + for(i = 0; i < decoder->private_->frame.header.blocksize; i++) { if(!decoder->private_->side_subframe_in_use){ FLAC__int32 mid, side; mid = decoder->private_->output[0][i]; |