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; diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index 056b3cacd8..b3546b55bd 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -117,10 +117,10 @@ stddev: 10.99 PSNR:27.30 bytes:7602176 1055276 ./data/out.wav d056da679e6d6682812fffb28a7f0db6 *./data/a-ac3.rm 97983 ./data/a-ac3.rm -e1aa1d139e8e241cdf9be8ac8252dabb *./data/a-g726.wav -24330 ./data/a-g726.wav -2f1b2fdb2ebdf4250a850fdcc28b50d1 *./data/out.wav -97188 ./data/out.wav +2d081e0e1f2e9bd4514e9ac8ec41884c *./data/a-g726.wav +24268 ./data/a-g726.wav +a719ab6d47d8d601520edb13bf6136b4 *./data/out.wav +96940 ./data/out.wav bdc512b78e2ccb1d815aec08794650eb *./data/a-adpcm_ima.wav 266288 ./data/a-adpcm_ima.wav 1316b03da3bdc8df9785c7995e3c9b2a *./data/out.wav diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index ed58e24af6..001b83470d 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -25,9 +25,9 @@ b57e3c4e0f27cbd0bf7b7fafb142fe7f *./data/b-libav.ffm fea20ced22451312dd463110e594eda6 *./data/b-libav.nut 332415 ./data/b-libav.nut ./data/b-libav.nut CRC=001a3415 -e62f54ddedb85e0f605abf295a18a08e *./data/b-libav.dv +29a2c312bbc5b187491183a918556475 *./data/b-libav.dv 3600000 ./data/b-libav.dv -./data/b-libav.dv CRC=82e03e76 +./data/b-libav.dv CRC=37b096b4 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm 317075 ./data/b-libav.pbm ./data/b-libav.pbm CRC=a1057fd1 diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index 4ad107fe80..3df2f92a6d 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -117,10 +117,10 @@ stddev: 3.43 PSNR:37.39 bytes:7602176 1055276 ./data/out.wav d056da679e6d6682812fffb28a7f0db6 *./data/a-ac3.rm 97983 ./data/a-ac3.rm -e1aa1d139e8e241cdf9be8ac8252dabb *./data/a-g726.wav -24330 ./data/a-g726.wav -2f1b2fdb2ebdf4250a850fdcc28b50d1 *./data/out.wav -97188 ./data/out.wav +2d081e0e1f2e9bd4514e9ac8ec41884c *./data/a-g726.wav +24268 ./data/a-g726.wav +a719ab6d47d8d601520edb13bf6136b4 *./data/out.wav +96940 ./data/out.wav bdc512b78e2ccb1d815aec08794650eb *./data/a-adpcm_ima.wav 266288 ./data/a-adpcm_ima.wav 1316b03da3bdc8df9785c7995e3c9b2a *./data/out.wav