mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-20 21:36:48 +00:00
values can fit uint8_t
Originally committed as revision 12980 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
183fceaafd
commit
dfcd6d91fe
@ -2476,10 +2476,10 @@ static int decode_frame_adu(AVCodecContext * avctx,
|
|||||||
|
|
||||||
#ifdef CONFIG_MP3ON4_DECODER
|
#ifdef CONFIG_MP3ON4_DECODER
|
||||||
/* Next 3 arrays are indexed by channel config number (passed via codecdata) */
|
/* Next 3 arrays are indexed by channel config number (passed via codecdata) */
|
||||||
static const int mp3Frames[16] = {0,1,1,2,3,3,4,5,2}; /* number of mp3 decoder instances */
|
static const uint8_t mp3Frames[16] = {0,1,1,2,3,3,4,5,2}; /* number of mp3 decoder instances */
|
||||||
static const int mp3Channels[16] = {0,1,2,3,4,5,6,8,4}; /* total output channels */
|
static const uint8_t mp3Channels[16] = {0,1,2,3,4,5,6,8,4}; /* total output channels */
|
||||||
/* offsets into output buffer, assume output order is FL FR BL BR C LFE */
|
/* offsets into output buffer, assume output order is FL FR BL BR C LFE */
|
||||||
static const int chan_offset[9][5] = {
|
static const uint8_t chan_offset[9][5] = {
|
||||||
{0},
|
{0},
|
||||||
{0}, // C
|
{0}, // C
|
||||||
{0}, // FLR
|
{0}, // FLR
|
||||||
@ -2566,7 +2566,7 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
|
|||||||
const unsigned char *start2 = buf, *start;
|
const unsigned char *start2 = buf, *start;
|
||||||
int fr, i, j, n;
|
int fr, i, j, n;
|
||||||
int off = avctx->channels;
|
int off = avctx->channels;
|
||||||
const int *coff = chan_offset[s->chan_cfg];
|
const uint8_t *coff = chan_offset[s->chan_cfg];
|
||||||
|
|
||||||
len = buf_size;
|
len = buf_size;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user