Merge commit 'fca3c3b61952aacc45e9ca54d86a762946c21942'

[ffmpeg] / libavcodec / flacdsp_template.c

diff --git a/libavcodec/flacdsp_template.c b/libavcodec/flacdsp_template.c
index 62c0a15ff61326d6a1b7bbb601be0f848a7fce01..776c78da7195d0bf0013b95c2db63596ef401c27 100644 (file)
--- a/libavcodec/flacdsp_template.c
+++ b/libavcodec/flacdsp_template.c
@@ -56,7 +56,7 @@ static void FUNC(flac_decorrelate_indep_c)(uint8_t **out, int32_t **in,
 
     for (j = 0; j < len; j++)
         for (i = 0; i < channels; i++)
-            S(samples, i, j) = in[i][j] << shift;
+            S(samples, i, j) = (int)((unsigned)in[i][j] << shift);
 }
 
 static void FUNC(flac_decorrelate_ls_c)(uint8_t **out, int32_t **in,