Commit 231fdec2 authored by bcoudurier's avatar bcoudurier

cosmetics: merge decls

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12997 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e4e7c4c0
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment