correctly compute out_size and samples number

Originally committed as revision 12985 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago · 9708d52ee8
parent cd3289650a
commit 9708d52ee8
1 changed files with 2 additions and 3 deletions
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@ -2596,11 +2596,10 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
        }

        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) {
+            n = m->avctx->frame_size*m->nb_channels;
            /* interleave output data */
            bp = out_samples + coff[fr];
            if(m->nb_channels == 1) {