From 41b8800f8861a6d7eac3a37ea39f5476abd73e92 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sat, 26 Apr 2008 14:36:34 +0000 Subject: merge init with declaration Originally committed as revision 12998 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegaudiodec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavcodec/mpegaudiodec.c') 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) -- cgit v1.2.3