[FFmpeg-cvslog] swr: remove another forgotten division in DSP function.

Ronald S. Bultje git at videolan.org
Sun Jun 22 06:05:44 CEST 2014


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Jun 21 17:09:29 2014 -0400| [0dae193d3ecf5d0dc687f5ad708419bf7600de9a] | committer: Michael Niedermayer

swr: remove another forgotten division in DSP function.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0dae193d3ecf5d0dc687f5ad708419bf7600de9a
---

 libswresample/resample_template.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libswresample/resample_template.c b/libswresample/resample_template.c
index 9279c71..0fc9770 100644
--- a/libswresample/resample_template.c
+++ b/libswresample/resample_template.c
@@ -168,8 +168,6 @@ int RENAME(swri_resample_linear)(ResampleContext *c,
     int dst_index;
     int index= c->index;
     int frac= c->frac;
-    int dst_incr_frac= c->dst_incr % c->src_incr;
-    int dst_incr=      c->dst_incr / c->src_incr;
     int sample_index = index >> c->phase_shift;
 
     index &= c->phase_mask;
@@ -189,8 +187,8 @@ int RENAME(swri_resample_linear)(ResampleContext *c,
         val += (v2 - val) * (FELEML) frac / c->src_incr;
         OUT(dst[dst_index], val);
 
-        frac += dst_incr_frac;
-        index += dst_incr;
+        frac += c->dst_incr_mod;
+        index += c->dst_incr_div;
         if (frac >= c->src_incr) {
             frac -= c->src_incr;
             index++;



More information about the ffmpeg-cvslog mailing list