From d58b25aaa261040cec29bffa571c41bc9f652f10 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 7 Oct 2012 16:02:20 -0400 Subject: [PATCH] adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order Should fix fate-acodec-adpcm-ima_wav with several compilers. Signed-off-by: Michael Niedermayer --- libavcodec/adpcmenc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index f016ebd910..747b9fe4c4 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -538,8 +538,9 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ADPCMChannelStatus *status = &c->status[ch]; const int16_t *smp = &samples_p[ch][1 + i * 8]; for (j = 0; j < 8; j += 2) { - *dst++ = adpcm_ima_compress_sample(status, smp[j ]) | - (adpcm_ima_compress_sample(status, smp[j + 1]) << 4); + uint8_t v = adpcm_ima_compress_sample(status, smp[j ]); + v |= (adpcm_ima_compress_sample(status, smp[j + 1]) << 4); + *dst++ = v; } } }