From f91c089812ae7d211df0e9813b4294de921a7653 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sat, 26 Apr 2008 14:34:01 +0000 Subject: [PATCH] cosmetics: merge decls Originally committed as revision 12997 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegaudiodec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 0334231..63584dc 100644 --- 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; -- 2.7.4