diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-05 21:20:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-06 01:46:51 +0100 |
| commit | c88f0b728c10687ff7112d8e8fcf39b056f9f0b6 (patch) | |
| tree | a51ea134b8b888a818c6cef54b5aeae185a0ca26 /libavcodec/tta.c | |
| parent | c4f237a98175438e76da64c51cc6fe613f8d767e (diff) | |
| download | ffmpeg-streaming-c88f0b728c10687ff7112d8e8fcf39b056f9f0b6.zip ffmpeg-streaming-c88f0b728c10687ff7112d8e8fcf39b056f9f0b6.tar.gz | |
tta: Fix regression of 24bit decoding.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tta.c')
| -rw-r--r-- | libavcodec/tta.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/tta.c b/libavcodec/tta.c index f629901..a388cfd 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -324,10 +324,6 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data, return ret; } - // decode directly to output buffer for 24-bit sample format - if (s->bps == 3) - s->decode_buffer = data; - // init per channel states for (i = 0; i < s->channels; i++) { s->ch_ctx[i].predictor = 0; @@ -433,7 +429,7 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data, // shift samples for 24-bit sample format int32_t *samples = (int32_t *)s->frame.data[0]; for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++) - *samples++ <<= 8; + *samples++ = *p<<8; // reset decode buffer s->decode_buffer = NULL; break; |
