diff options
| author | Martin Storsjö <martin@martin.st> | 2014-06-05 11:56:10 +0300 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-10 00:24:22 +0200 |
| commit | 71516ac175aaf10466db1998205aea8a31387370 (patch) | |
| tree | 1fcdbffb64b2d685e1531aff307cc73b52ca406b | |
| parent | 0983720cf2b45d6f8b19ab406ff2f07c34caedf1 (diff) | |
| download | ffmpeg-71516ac175aaf10466db1998205aea8a31387370.tar.gz | |
adpcm: Fix trellis encoding of IMA QT
This was broken in 095be4fb - samples+ch (for the previous
non-planar case) equals &samples_p[ch][0]. The confusion
probably stemmed from the IMA WAV case where it originally
was &samples[avctx->channels + ch], which was correctly
changed into &samples_p[ch][1].
Fixes part of Ticket3701
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a32765c4252eb106a2ade543026ef6f59e699bfa)
| -rw-r--r-- | libavcodec/adpcmenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 59f016bdb1..fed0cc8a19 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -557,7 +557,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, put_bits(&pb, 7, status->step_index); if (avctx->trellis > 0) { uint8_t buf[64]; - adpcm_compress_trellis(avctx, &samples_p[ch][1], buf, status, + adpcm_compress_trellis(avctx, &samples_p[ch][0], buf, status, 64, 1); for (i = 0; i < 64; i++) put_bits(&pb, 4, buf[i ^ 1]); |