diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 13:32:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 13:32:56 +0200 |
| commit | 6333c6c17d1f43df0a5f07fdcaee40122fddcd60 (patch) | |
| tree | 7694c9a9730e0c3a25ec33204637e59c6e325bd2 | |
| parent | 5fa56e6e623948e7316c2d3d1a221e4ab48f6cc4 (diff) | |
| parent | 21d3e0ac9e1719d8444b3f5466983587ac0ad240 (diff) | |
| download | ffmpeg-6333c6c17d1f43df0a5f07fdcaee40122fddcd60.tar.gz | |
Merge commit '21d3e0ac9e1719d8444b3f5466983587ac0ad240' into release/1.1
* commit '21d3e0ac9e1719d8444b3f5466983587ac0ad240':
adpcm: Write the proper predictor in trellis mode in IMA QT
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/adpcmenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 3bde2adb19..7924bb349b 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -562,6 +562,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, 64, 1); for (i = 0; i < 64; i++) put_bits(&pb, 4, buf[i ^ 1]); + status->prev_sample = status->predictor; } else { for (i = 0; i < 64; i += 2) { int t1, t2; |