cosmetics: merge decls

Originally committed as revision 12997 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago · f91c089812
parent 5fd7a9fcdf
commit f91c089812
1 changed files with 1 additions and 2 deletions
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@ -2566,12 +2566,11 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
 {
    MP3On4DecodeContext *s = avctx->priv_data;
    MPADecodeContext *m;
-    int len, out_size = 0;
+    int len, fsize, 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 fsize;
    int fr, j, n;

    len = buf_size;