Merge remote-tracking branch 'shariman/wmall'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Dec 2011 17:44:37 +0000 (18:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Dec 2011 17:44:46 +0000 (18:44 +0100)
* shariman/wmall:
  Pass pointer to integer buffer instead of integer to memcpy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/wmalosslessdec.c

index 03fbb1fdb835525302ccd965db0f8aa62586b4ee..2b32bccba10a4503b26be305796d645a35d1913a 100644 (file)
@@ -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;