har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tta: Fix several warning: initialization from incompatible pointer type [enabled by default]

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-18 00:39:48 +01:00
parent 8beeec8821
commit bd35dfeaa0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/tta.c
View File

@ -418,7 +418,7 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data,
// convert to output buffer // convert to output buffer
switch(s->bps) { switch(s->bps) {
case 1: { 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++) for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++)
*samples++ = *p + 0x80; *samples++ = *p + 0x80;
break; break;
@ -431,7 +431,7 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data,
} }
case 3: { case 3: {
// shift samples for 24-bit sample format // 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++) for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++)
*samples++ <<= 8; *samples++ <<= 8;
// reset decode buffer // reset decode buffer