[FFmpeg-cvslog] tta: Fix regression of 24bit decoding.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  5 21:20:59 2012 +0100| [c88f0b728c10687ff7112d8e8fcf39b056f9f0b6] | committer: Michael Niedermayer

tta: Fix regression of 24bit decoding.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c88f0b728c10687ff7112d8e8fcf39b056f9f0b6
---

 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;