mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
merge init with declaration
Originally committed as revision 12998 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
f91c089812
commit
41b8800f88
@ -2566,15 +2566,13 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
|
|||||||
{
|
{
|
||||||
MP3On4DecodeContext *s = avctx->priv_data;
|
MP3On4DecodeContext *s = avctx->priv_data;
|
||||||
MPADecodeContext *m;
|
MPADecodeContext *m;
|
||||||
int len, fsize, out_size = 0;
|
int fsize, len = buf_size, out_size = 0;
|
||||||
uint32_t header;
|
uint32_t header;
|
||||||
OUT_INT *out_samples = data;
|
OUT_INT *out_samples = data;
|
||||||
OUT_INT decoded_buf[MPA_FRAME_SIZE * MPA_MAX_CHANNELS];
|
OUT_INT decoded_buf[MPA_FRAME_SIZE * MPA_MAX_CHANNELS];
|
||||||
OUT_INT *outptr, *bp;
|
OUT_INT *outptr, *bp;
|
||||||
int fr, j, n;
|
int fr, j, n;
|
||||||
|
|
||||||
len = buf_size;
|
|
||||||
|
|
||||||
*data_size = 0;
|
*data_size = 0;
|
||||||
// Discard too short frames
|
// Discard too short frames
|
||||||
if (buf_size < HEADER_SIZE)
|
if (buf_size < HEADER_SIZE)
|
||||||
|
Loading…
Reference in New Issue
Block a user