aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-12-03 16:43:10 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-12-06 00:07:50 +0100
commitc39e8d05f587ef8a48d1c2d0dba898bf8bcd7287 (patch)
treedb92b1ccdff0107ed5fd38d2e970c5cc0d297d64
parenta0715c1e897f148022bd3dc033465595d40fdb4c (diff)
downloadffmpeg-c39e8d05f587ef8a48d1c2d0dba898bf8bcd7287.tar.gz
avcodec/flacdsp_template: Fix undefined shift in flac_decorrelate_indep_c
Fixes: left shift of negative value Fixes: 668346-media Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit acc163c6ab52d2235767852262c64c7f6b273d1c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/flacdsp_template.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flacdsp_template.c b/libavcodec/flacdsp_template.c
index 62c0a15ff6..776c78da71 100644
--- 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,