Module: libav Branch: master Commit: 5364327186fb90d67c860968a76bb0ec075308d4
Author: Justin Ruggles <[email protected]> Committer: Justin Ruggles <[email protected]> Date: Sat Oct 6 23:58:03 2012 -0400 adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order Should fix fate-acodec-adpcm-ima_wav with several compilers. --- libavcodec/adpcmenc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 5c95ad7..f81d7fd 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -537,8 +537,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; } } } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
