summaryrefslogtreecommitdiff
path: root/libavcodec/dirac_dwt_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-07-13 18:33:08 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-07-14 18:02:26 +0200
commit181435a4de6e38e0a15ddaf16de9a157ef41cb18 (patch)
tree2ed37c1921ef060887fa2f5ff8c83e3be3108882 /libavcodec/dirac_dwt_template.c
parentc0b42987a272caedc10d87bcd5d3a5c434cf40ef (diff)
avcodec/dirac_dwt_template: Fix signedness regression in interleave()
Found-by: <jdarnley> Tested-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/dirac_dwt_template.c')
-rw-r--r--libavcodec/dirac_dwt_template.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c
index 528fc7e9e7..2369c8d15b 100644
--- a/libavcodec/dirac_dwt_template.c
+++ b/libavcodec/dirac_dwt_template.c
@@ -57,8 +57,8 @@ static av_always_inline void RENAME(interleave)(TYPE *dst, TYPE *src0, TYPE *src
{
int i;
for (i = 0; i < w2; i++) {
- dst[2*i ] = (src0[i] + (unsigned)add) >> shift;
- dst[2*i+1] = (src1[i] + (unsigned)add) >> shift;
+ dst[2*i ] = ((int)(src0[i] + (unsigned)add)) >> shift;
+ dst[2*i+1] = ((int)(src1[i] + (unsigned)add)) >> shift;
}
}