[FFmpeg-cvslog] resample: Fix boundary handling with fragments.

Michael Niedermayer git at videolan.org
Sun Mar 25 10:59:32 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 25 10:34:06 2012 +0200| [7e592379d909e5df2382b0aab92d51d98dafe578] | committer: Michael Niedermayer

resample: Fix boundary handling with fragments.

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

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

 libswresample/resample.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswresample/resample.c b/libswresample/resample.c
index 2960a35..d3c5cfa 100644
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -294,11 +294,11 @@ int swri_resample(ResampleContext *c, int16_t *dst, const int16_t *src, int *con
             int sample_index= index >> c->phase_shift;
             FELEM2 val=0;
 
-            if(sample_index < 0){
-                for(i=0; i<c->filter_length; i++)
-                    val += src[FFABS(sample_index + i) % src_size] * filter[i];
-            }else if(sample_index + c->filter_length > src_size){
+            if(sample_index + c->filter_length > src_size || -sample_index >= src_size){
                 break;
+            }else if(sample_index < 0){
+                for(i=0; i<c->filter_length; i++)
+                    val += src[FFABS(sample_index + i)] * filter[i];
             }else if(c->linear){
                 FELEM2 v2=0;
                 for(i=0; i<c->filter_length; i++){



More information about the ffmpeg-cvslog mailing list