Commit 2ed42113 authored by Stefan Gehrer's avatar Stefan Gehrer

avoid indeterminate order of accessing src

Originally committed as revision 16855 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 04e76709
...@@ -1300,9 +1300,9 @@ static int adpcm_decode_frame(AVCodecContext *avctx, ...@@ -1300,9 +1300,9 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
} }
for (channel=0; channel<avctx->channels; channel++) { for (channel=0; channel<avctx->channels; channel++) {
srcC = src + (big_endian ? bytestream_get_be32(&src) srcC = src + (avctx->channels-channel) * 4;
: bytestream_get_le32(&src)) srcC += (big_endian ? bytestream_get_be32(&src)
+ (avctx->channels-channel-1) * 4; : bytestream_get_le32(&src));
samplesC = samples + channel; samplesC = samples + channel;
if (avctx->codec->id == CODEC_ID_ADPCM_EA_R1) { if (avctx->codec->id == CODEC_ID_ADPCM_EA_R1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment