Browse Source

dca: Set data_size outside block loop.

Originally committed as revision 15021 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Andreas Öman 17 years ago
parent
commit
a7bc9d1b71
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libavcodec/dca.c

+ 1
- 2
libavcodec/dca.c View File

@@ -1183,12 +1183,11 @@ static int dca_decode_frame(AVCodecContext * avctx,


if(*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels) if(*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels)
return -1; return -1;
*data_size = 0;
*data_size = 256 / 8 * s->sample_blocks * sizeof(int16_t) * channels;
for (i = 0; i < (s->sample_blocks / 8); i++) { for (i = 0; i < (s->sample_blocks / 8); i++) {
dca_decode_block(s); dca_decode_block(s);
s->dsp.float_to_int16_interleave(samples, s->samples_chanptr, 256, channels); s->dsp.float_to_int16_interleave(samples, s->samples_chanptr, 256, channels);
samples += 256 * channels; samples += 256 * channels;
*data_size += 256 * sizeof(int16_t) * channels;
} }


return buf_size; return buf_size;


Loading…
Cancel
Save