1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

correctly compute out_size and samples number

Originally committed as revision 12985 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-04-26 13:03:41 +00:00
parent cd3289650a
commit 9708d52ee8

View File

@ -2596,11 +2596,10 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
} }
ff_mpegaudio_decode_header(m, header); ff_mpegaudio_decode_header(m, header);
mp_decode_frame(m, decoded_buf, start, fsize); out_size += mp_decode_frame(m, decoded_buf, start, fsize);
n = MPA_FRAME_SIZE * m->nb_channels;
out_size += n * sizeof(OUT_INT);
if(s->frames > 1) { if(s->frames > 1) {
n = m->avctx->frame_size*m->nb_channels;
/* interleave output data */ /* interleave output data */
bp = out_samples + coff[fr]; bp = out_samples + coff[fr];
if(m->nb_channels == 1) { if(m->nb_channels == 1) {