summaryrefslogtreecommitdiffstats
path: root/libavcodec/wmalosslessdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-08 18:44:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-08 18:44:46 +0100
commit15c481614bb410cfa147f8051024d42b01eadff8 (patch)
tree7f1ea068f15a2576bc527e6862e8abdcf3ce2607 /libavcodec/wmalosslessdec.c
parente2baaa21aabc7edb3c2275eac39ed1d40884b25a (diff)
parent6d4deecfdf0fe18d1a4b06aac49cabcdb9a25d3c (diff)
downloadffmpeg-streaming-15c481614bb410cfa147f8051024d42b01eadff8.zip
ffmpeg-streaming-15c481614bb410cfa147f8051024d42b01eadff8.tar.gz
Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall: Pass pointer to integer buffer instead of integer to memcpy Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmalosslessdec.c')
-rw-r--r--libavcodec/wmalosslessdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 03fbb1f..2b32bcc 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -834,10 +834,10 @@ static void mclms_update(WmallDecodeCtx *s, int icoef)
}
if (s->mclms_recent == 0) {
- memcpy(s->mclms_prevvalues[order * num_channels],
+ memcpy(&s->mclms_prevvalues[order * num_channels],
s->mclms_prevvalues,
bps * order * num_channels);
- memcpy(s->mclms_updates[order * num_channels],
+ memcpy(&s->mclms_updates[order * num_channels],
s->mclms_updates,
bps * order * num_channels);
s->mclms_recent = num_channels * order;
OpenPOWER on IntegriCloud