On Sat, 6 Oct 2012, Justin Ruggles wrote:
Should fix fate-acodec-adpcm-ima_wav with several compilers. --- libavcodec/adpcmenc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 5c95ad7..6816f60 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -537,8 +537,8 @@ 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); + *dst = adpcm_ima_compress_sample(status, smp[j ]); + *dst++ |= (adpcm_ima_compress_sample(status, smp[j + 1]) << 4); } } } -- 1.7.1
LGTM, fixes FATE on MSVC for me. // Martin _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
