diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-08-14 15:18:49 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-08-14 15:18:49 +0000 |
| commit | bb22e8b17523dedb32135d7691086a6add6c9cb7 (patch) | |
| tree | 57c66674bfc5d7b4957b560dff67e3df7ba26c04 | |
| parent | 9d53d58ea784a44eee8afb35a324a267157425e5 (diff) | |
| download | ffmpeg-bb22e8b17523dedb32135d7691086a6add6c9cb7.tar.gz | |
10l (lrintf(a)+b vs. lrintf(a+b))
Originally committed as revision 3391 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/resample2.c | 2 | ||||
| -rw-r--r-- | tests/ffmpeg.regression.ref | 4 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 4 | ||||
| -rw-r--r-- | tests/rotozoom.regression.ref | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c index 7a19715ce4..752da309eb 100644 --- a/libavcodec/resample2.c +++ b/libavcodec/resample2.c @@ -104,7 +104,7 @@ void av_build_filter(int16_t *filter, double factor, int tap_count, int phase_co /* normalize so that an uniform color remains the same */ for(i=0;i<tap_count;i++) { - v = clip(lrintf(tab[i] * scale / norm) + e, -32768, 32767); + v = clip(lrintf(tab[i] * scale / norm + e), -32768, 32767); filter[ph * tap_count + i] = v; e += tab[i] * scale / norm - v; } diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index 88abdd7d09..d26dc61966 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -117,9 +117,9 @@ stddev: 10.99 PSNR:27.30 bytes:7602176 1055278 ./data/out.wav d056da679e6d6682812fffb28a7f0db6 *./data/a-ac3.rm 97983 ./data/a-ac3.rm -ca36e726f055dbd45c217db6e240a15c *./data/a-g726.wav +69526b38166395785eec8ccfb90a105e *./data/a-g726.wav 24332 ./data/a-g726.wav -0d06dca7464958b5ee7798e6eab3c6cd *./data/out.wav +20cb2fcffd33573a60c93d4dceacd1d1 *./data/out.wav 97190 ./data/out.wav bdc512b78e2ccb1d815aec08794650eb *./data/a-adpcm_ima.wav 266288 ./data/a-adpcm_ima.wav diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index f241b33507..c12aac3070 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 -4e4b45f8f39ee65658c40ccc3e94a2b0 *./data/b-libav.dv +f96648fa4a0968f5386d0c6ed9190d98 *./data/b-libav.dv 3600000 ./data/b-libav.dv -./data/b-libav.dv CRC=03701687 +./data/b-libav.dv CRC=82e03e76 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 de66ba9dd4..22a596a034 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -117,9 +117,9 @@ stddev: 3.43 PSNR:37.39 bytes:7602176 1055278 ./data/out.wav d056da679e6d6682812fffb28a7f0db6 *./data/a-ac3.rm 97983 ./data/a-ac3.rm -ca36e726f055dbd45c217db6e240a15c *./data/a-g726.wav +69526b38166395785eec8ccfb90a105e *./data/a-g726.wav 24332 ./data/a-g726.wav -0d06dca7464958b5ee7798e6eab3c6cd *./data/out.wav +20cb2fcffd33573a60c93d4dceacd1d1 *./data/out.wav 97190 ./data/out.wav bdc512b78e2ccb1d815aec08794650eb *./data/a-adpcm_ima.wav 266288 ./data/a-adpcm_ima.wav |