]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
merge init with declaration
authorbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 26 Apr 2008 14:36:34 +0000 (14:36 +0000)
committerbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 26 Apr 2008 14:36:34 +0000 (14:36 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12998 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/mpegaudiodec.c

index 63584dcc9029989aba9f5ea6d65d6cc40dd72611..108b74552795827415ed618b85648a0d67e80c7a 100644 (file)
@@ -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)