summaryrefslogtreecommitdiff
path: root/libavcodec/mpegaudiodec.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-26 14:34:01 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-26 14:34:01 +0000
commitf91c089812ae7d211df0e9813b4294de921a7653 (patch)
treebf26e79cda19e16b507ed5457d31058cb39c8e6b /libavcodec/mpegaudiodec.c
parent5fd7a9fcdf472e957b0c2f453f13d7f33e07a4a5 (diff)
cosmetics: merge decls
Originally committed as revision 12997 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
-rw-r--r--libavcodec/mpegaudiodec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 0334231ecd..63584dcc90 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;