From b194c327fcedaf3fa9605840466ebcfeb622edb3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 16 Jul 2005 11:18:42 +0000 Subject: yamaha adpcm nibbles in the wrong order fix by (Vidar Madsen: vidarino, gmail com) Originally committed as revision 4446 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/adpcm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 67a98769db..3c67242f41 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -406,8 +406,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, for (; n>0; n--) { for(i = 0; i < avctx->channels; i++) { int nibble; - nibble = adpcm_yamaha_compress_sample(&c->status[i], samples[i]) << 4; - nibble |= adpcm_yamaha_compress_sample(&c->status[i], samples[i+avctx->channels]); + nibble = adpcm_yamaha_compress_sample(&c->status[i], samples[i]); + nibble |= adpcm_yamaha_compress_sample(&c->status[i], samples[i+avctx->channels]) << 4; *dst++ = nibble; } samples += 2 * avctx->channels; @@ -1047,14 +1047,14 @@ static int adpcm_decode_frame(AVCodecContext *avctx, while (src < buf + buf_size) { if (st) { *samples++ = adpcm_yamaha_expand_nibble(&c->status[0], - (src[0] >> 4) & 0x0F); - *samples++ = adpcm_yamaha_expand_nibble(&c->status[1], src[0] & 0x0F); - } else { - *samples++ = adpcm_yamaha_expand_nibble(&c->status[0], + *samples++ = adpcm_yamaha_expand_nibble(&c->status[1], (src[0] >> 4) & 0x0F); + } else { *samples++ = adpcm_yamaha_expand_nibble(&c->status[0], src[0] & 0x0F); + *samples++ = adpcm_yamaha_expand_nibble(&c->status[0], + (src[0] >> 4) & 0x0F); } src++; } -- cgit v1.2.3