diff options
author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-04-26 14:36:34 +0000 |
---|---|---|
committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-04-26 14:36:34 +0000 |
commit | 41b8800f8861a6d7eac3a37ea39f5476abd73e92 (patch) | |
tree | b853d735f1044118fdfbe6c835823fcc5319fdaa | |
parent | f91c089812ae7d211df0e9813b4294de921a7653 (diff) | |
download | ffmpeg-41b8800f8861a6d7eac3a37ea39f5476abd73e92.tar.gz |
merge init with declaration
Originally committed as revision 12998 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/mpegaudiodec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 63584dcc90..108b745527 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -2566,15 +2566,13 @@ static int decode_frame_mp3on4(AVCodecContext * avctx, { MP3On4DecodeContext *s = avctx->priv_data; MPADecodeContext *m; - int len, fsize, out_size = 0; + int fsize, len = buf_size, out_size = 0; uint32_t header; OUT_INT *out_samples = data; OUT_INT decoded_buf[MPA_FRAME_SIZE * MPA_MAX_CHANNELS]; OUT_INT *outptr, *bp; int fr, j, n; - len = buf_size; - *data_size = 0; // Discard too short frames if (buf_size < HEADER_SIZE) |