10l (lrintf(a)+b vs. lrintf(a+b))

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3391 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index 7a19715ce4bee8c8a16412a813ca5c9263edf286..752da309eb9fc2dfb686975eb290846b20e7426e 100644 (file)
--- 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 88abdd7d09a1a9e53dc5fdd05b37bf9c06ea66b0..d26dc619668174d18ebb7aa741a096e9ee193a08 100644 (file)
--- 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 f241b3350717bead026196ab87d30e3d734085dd..c12aac3070c5c6e06d2ed07c4191a32b81793189 100644 (file)
--- 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 de66ba9dd42f19254d5184063824ea3ba534f8b0..22a596a034822cd63142f0e8d46c8fd0ef3e470b 100644 (file)
--- 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