aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-09-03 09:22:31 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-19 03:51:38 +0100
commit3e9ccd001901a16ef82bf9ab0cf065ef098eedd5 (patch)
tree3cf4b51510bfc8e6af600c272e92b7142b94640e /libswresample
parentfb84d92079afdccd8339824d86e6871404666923 (diff)
downloadffmpeg-3e9ccd001901a16ef82bf9ab0cf065ef098eedd5.tar.gz
swresample/swresample: Fix integer overflow in seed calculation
Fixes CID1322333 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 32f53958b8f6ed4c3c2a7447c1e47d012796fae2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/swresample.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 6689027e1a..f3c922bc26 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -643,7 +643,7 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co
return ret;
if(ret)
for(ch=0; ch<s->dither.noise.ch_count; ch++)
- if((ret=swri_get_dither(s, s->dither.noise.ch[ch], s->dither.noise.count, 12345678913579<<ch, s->dither.noise.fmt))<0)
+ if((ret=swri_get_dither(s, s->dither.noise.ch[ch], s->dither.noise.count, (12345678913579ULL*ch + 3141592) % 2718281828U, s->dither.noise.fmt))<0)
return ret;
av_assert0(s->dither.noise.ch_count == preout->ch_count);