adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order

Should fix fate-acodec-adpcm-ima_wav with several compilers.
12 years ago · 5364327186
parent 62ae37decd
commit 5364327186
1 changed files with 3 additions and 2 deletions
--- 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;
                    }
                }
            }