merge init with declaration

Originally committed as revision 12998 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago · 41b8800f88
parent f91c089812
commit 41b8800f88
1 changed files with 1 additions and 3 deletions
--- 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)