Commit 68c58034 authored by bcoudurier's avatar bcoudurier

values can fit uint8_t

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12980 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent cd493737
...@@ -2476,10 +2476,10 @@ static int decode_frame_adu(AVCodecContext * avctx, ...@@ -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, ...@@ -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;
......
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