diff options
| author | Paul B Mahol <onemda@gmail.com> | 2011-12-21 19:27:53 +0000 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-12-22 23:04:30 +0100 |
| commit | 01a01bf8bdafab1c81c3039850aba042b247626f (patch) | |
| tree | 11d8356f32dd79e22970be6fff03ef4586851d89 | |
| parent | c32e4029d99fb1bff3df86f62a3ce61d2419aae0 (diff) | |
| download | ffmpeg-01a01bf8bdafab1c81c3039850aba042b247626f.tar.gz | |
adpcm: fix IMA SMJPEG decoding
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| -rw-r--r-- | libavcodec/adpcm.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 48f44fe8dc..2081ef64d7 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1001,11 +1001,15 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, break; case CODEC_ID_ADPCM_IMA_AMV: case CODEC_ID_ADPCM_IMA_SMJPEG: - c->status[0].predictor = (int16_t)bytestream_get_le16(&src); - c->status[0].step_index = bytestream_get_le16(&src); - - if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV) - src+=4; + if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV) { + c->status[0].predictor = sign_extend(bytestream_get_le16(&src), 16); + c->status[0].step_index = bytestream_get_le16(&src); + src += 4; + } else { + c->status[0].predictor = sign_extend(bytestream_get_be16(&src), 16); + c->status[0].step_index = bytestream_get_byte(&src); + src += 1; + } for (n = nb_samples >> (1 - st); n > 0; n--, src++) { char hi, lo; |