diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-10-21 20:01:32 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-10-21 20:01:32 +0000 |
| commit | 4e255822e5119755c57c5d9498163ad3627b8ef5 (patch) | |
| tree | 0b0ed0383bdf430109229117cfa852360b16938e /libavcodec/resample2.c | |
| parent | 6e1c66bc06af5009b4aa5ab7e103a0e289b06310 (diff) | |
100l (dont reset the sample position at the block end)
Originally committed as revision 3618 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/resample2.c')
| -rw-r--r-- | libavcodec/resample2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c index 05b12a0df1..5fdd611539 100644 --- a/libavcodec/resample2.c +++ b/libavcodec/resample2.c @@ -223,7 +223,7 @@ int av_resample(AVResampleContext *c, short *dst, short *src, int *consumed, int } } *consumed= FFMAX(index, 0) >> c->phase_shift; - index= FFMIN(index, 0); + if(index>=0) index &= c->phase_mask; if(compensation_distance){ compensation_distance -= dst_index; |