diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 00:39:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 01:20:18 +0100 |
| commit | bd35dfeaa083bc5fb38d900a3055a418ee64118b (patch) | |
| tree | 7b35aabb90b02b9842e75a97cf256738e603fd5d /libavcodec | |
| parent | 8beeec8821bd78d8740b1ced79a03322646f3578 (diff) | |
tta: Fix several warning: initialization from incompatible pointer type [enabled by default]
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/tta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 2c3539e44f..684b3fe414 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -418,7 +418,7 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data, // convert to output buffer switch(s->bps) { case 1: { - uint8_t *samples = (int16_t *)s->frame.data[0]; + uint8_t *samples = (uint8_t *)s->frame.data[0]; for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++) *samples++ = *p + 0x80; break; @@ -431,7 +431,7 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data, } case 3: { // shift samples for 24-bit sample format - int32_t *samples = (int16_t *)s->frame.data[0]; + int32_t *samples = (int32_t *)s->frame.data[0]; for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++) *samples++ <<= 8; // reset decode buffer |