Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'

[ffmpeg] / libavcodec / wmalosslessdec.c

diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index a03b118e86179a3a433228d5eb82d5fb5753add2..fcadbc034bf9e66cc621f07399e0d4ceecc8e989 100644 (file)
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -52,7 +52,7 @@
 /**
  * @brief frame-specific decoder context for a single channel
  */
-typedef struct {
+typedef struct WmallChannelCtx {
     int16_t     prev_block_len;                         ///< length of the previous block
     uint8_t     transmit_coefs;
     uint8_t     num_subframes;
@@ -176,7 +176,7 @@ typedef struct WmallDecodeCtx {
 } WmallDecodeCtx;
 
 /** Get sign of integer (1 for positive, -1 for negative and 0 for zero) */
-#define WMASIGN(x) ((x > 0) - (x < 0))
+#define WMASIGN(x) (((x) > 0) - ((x) < 0))
 
 static av_cold int decode_init(AVCodecContext *avctx)
 {
@@ -700,9 +700,9 @@ static void lms_update(WmallDecodeCtx *s, int ich, int ilms, int input)
         recent--;
     else {
         memcpy(s->cdlms[ich][ilms].lms_prevvalues + order,
-               s->cdlms[ich][ilms].lms_prevvalues, 2 * order);
+               s->cdlms[ich][ilms].lms_prevvalues, sizeof(*s->cdlms[ich][ilms].lms_prevvalues) * order);
         memcpy(s->cdlms[ich][ilms].lms_updates + order,
-               s->cdlms[ich][ilms].lms_updates, 2 * order);
+               s->cdlms[ich][ilms].lms_updates, sizeof(*s->cdlms[ich][ilms].lms_updates) * order);
         recent = order - 1;
     }