commit d39cc3c092936896d787c29d7e215a273e22a57e
author Michael Niedermayer <michaelni@gmx.at> Thu Oct 27 14:34:45 2011 +0200
committer Michael Niedermayer <michaelni@gmx.at> Sun Nov 06 19:49:12 2011 +0100
tree fccba119e3c6c048f6df51dc5d7429efd09cad32
parent e124c3c298a7abe2ded2b90817915c5baf8ea1be

resample2: fix potential overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a39b5e8b323785695fb0e3c0f30bd9e24287db87)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/resample2.c

diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index 0147819..19fed30 100644
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -227,10 +227,9 @@
             dst[dst_index] = src[index2>>32];
             index2 += incr;
         }
-        frac += dst_index * dst_incr_frac;
         index += dst_index * dst_incr;
-        index += frac / c->src_incr;
-        frac %= c->src_incr;
+        index += (frac + dst_index * (int64_t)dst_incr_frac) / c->src_incr;
+        frac   = (frac + dst_index * (int64_t)dst_incr_frac) % c->src_incr;
   }else{
     for(dst_index=0; dst_index < dst_size; dst_index++){
         FELEM *filter= c->filter_bank + c->filter_length*(index & c->phase_mask);