[FFmpeg-cvslog] swresample/resample: simplify index/consumed calculation for the filter = 1 case

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 14 02:23:04 2014 +0200| [5e379cd3ee87f00db3fdc25e559f9ff1b7ef8efe] | committer: Michael Niedermayer

swresample/resample: simplify index/consumed calculation for the filter = 1 case

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

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

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

diff --git a/libswresample/resample_template.c b/libswresample/resample_template.c
index 9269fea..a627f11 100644
--- a/libswresample/resample_template.c
+++ b/libswresample/resample_template.c
@@ -116,8 +116,8 @@ int RENAME(swri_resample)(ResampleContext *c, DELEM *dst, const DELEM *src, int
         index += (frac + dst_index * (int64_t)dst_incr_frac) / c->src_incr;
         frac   = (frac + dst_index * (int64_t)dst_incr_frac) % c->src_incr;
         av_assert2(index >= 0);
-        *consumed= index >> c->phase_shift;
-        index &= c->phase_mask;
+        *consumed= index;
+        index = 0;
     }else if(compensation_distance == 0 && !c->linear && index >= 0){
         int sample_index = 0;
         for(dst_index=0; dst_index < dst_size; dst_index++){