The last flag fix fixed mpeg4-qprd (there the flags ended up being trashed

through lrintf(), that is gcc put the 32bit int flags in a 32bit float
which caused some to be lost ...).
I wonder why FATE did not pick this up?

Originally committed as revision 12329 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 1ff9ecd5a044cafda786b55367e98162840a276b..43f79ef7b1790ecf63126706b1946abe5cd7f8bc 100644 (file)
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -74,10 +74,10 @@ stddev: 10.40 PSNR:27.78 bytes:7602176
 604580 ./tests/data/a-mpeg4-adv.avi
 ee7f2a0be286f09e20372e127364d690 *./tests/data/mpeg4adv.vsynth.out.yuv
 stddev:  6.99 PSNR:31.23 bytes:7602176
-13bc53ae93709323b8989cc4f8ea4b1e *./tests/data/a-mpeg4-qprd.avi
-736920 ./tests/data/a-mpeg4-qprd.avi
-745ccd9185f579cde533c1500fc4adc7 *./tests/data/mpeg4adv.vsynth.out.yuv
-stddev: 10.04 PSNR:28.08 bytes:7602176
+b52f11515c6d209ab68c1ccd177d8997 *./tests/data/a-mpeg4-qprd.avi
+725392 ./tests/data/a-mpeg4-qprd.avi
+615524174e9c10f0460fb2205e7140bc *./tests/data/mpeg4adv.vsynth.out.yuv
+stddev:  9.92 PSNR:28.19 bytes:7602176
 5b105ca591f94fa1c2b420cd74b290a1 *./tests/data/a-mpeg4-adap.avi
 409360 ./tests/data/a-mpeg4-adap.avi
 6ae220d766c44af3bd58e3d2f5aefa8d *./tests/data/mpeg4adv.vsynth.out.yuv

diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 68cc3e7202149cdcb94afac852430fce519a2a69..4ec5eb599abfe770df3261c7a0b3426efc02c50f 100644 (file)
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -74,10 +74,10 @@ dee7be19486a76d96c88d18eefba8f86 *./tests/data/a-mpeg4-adv.avi
 141546 ./tests/data/a-mpeg4-adv.avi
 3f3a21e9db85a9c0f7022f557a5374c1 *./tests/data/mpeg4adv.rotozoom.out.yuv
 stddev:  4.94 PSNR:34.24 bytes:7602176
-1b1a692e11969deb1fe3c7144f8cb103 *./tests/data/a-mpeg4-qprd.avi
-233604 ./tests/data/a-mpeg4-qprd.avi
-95860ad446ca0665d873ae6781736095 *./tests/data/mpeg4adv.rotozoom.out.yuv
-stddev:  4.01 PSNR:36.05 bytes:7602176
+e7a09631afd7b75c6a0544c365aadbe1 *./tests/data/a-mpeg4-qprd.avi
+233154 ./tests/data/a-mpeg4-qprd.avi
+b5b5f761b63bbf5844085b03e0a76636 *./tests/data/mpeg4adv.rotozoom.out.yuv
+stddev:  3.75 PSNR:36.62 bytes:7602176
 78c93c522b23bcc7f84f8b592b0191b6 *./tests/data/a-mpeg4-adap.avi
 200120 ./tests/data/a-mpeg4-adap.avi
 fd7db0b14fa76d0734bbfa36dbb513f8 *./tests/data/mpeg4adv.rotozoom.out.yuv

diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 715a1a008005c9d394dc3c28e8c9116343063659..a760b9e0bc9d1526150b78a1bf88150d795869f5 100644 (file)
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -1758,47 +1758,47 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14873 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14873 flags:1
 ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:215220 size:13087 flags:1
+ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:212738 size:14347 flags:1
 ret: 0 st: 0 ts:0.800000 flags:0
-ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:159706 size:12679 flags:1
+ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:152640 size:14348 flags:1
 ret:-1 st: 0 ts:-0.320000 flags:1
 ret:-1 st:-1 ts:2.576668 flags:0
 ret: 0 st:-1 ts:1.470835 flags:1
-ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:187334 size:12986 flags:1
+ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:182580 size:14281 flags:1
 ret: 0 st: 0 ts:0.360000 flags:0
-ret: 0 st: 0 dts:0.400000 pts:0.400000 pos:99648 size:29366 flags:1
+ret: 0 st: 0 dts:0.400000 pts:0.400000 pos:94070 size:29366 flags:1
 ret:-1 st: 0 ts:-0.760000 flags:1
 ret:-1 st:-1 ts:2.153336 flags:0
 ret: 0 st:-1 ts:1.047503 flags:1
-ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:159706 size:12679 flags:1
+ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:152640 size:14348 flags:1
 ret: 0 st: 0 ts:-0.040000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14873 flags:1
 ret: 0 st: 0 ts:2.840000 flags:1
-ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:215220 size:13087 flags:1
+ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:212738 size:14347 flags:1
 ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:215220 size:13087 flags:1
+ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:212738 size:14347 flags:1
 ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.400000 pts:0.400000 pos:99648 size:29366 flags:1
+ret: 0 st: 0 dts:0.400000 pts:0.400000 pos:94070 size:29366 flags:1
 ret: 0 st: 0 ts:-0.480000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14873 flags:1
 ret: 0 st: 0 ts:2.400000 flags:1
-ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:215220 size:13087 flags:1
+ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:212738 size:14347 flags:1
 ret: 0 st:-1 ts:1.306672 flags:0
-ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:187334 size:12986 flags:1
+ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:182580 size:14281 flags:1
 ret: 0 st:-1 ts:0.200839 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14873 flags:1
 ret: 0 st: 0 ts:-0.920000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14873 flags:1
 ret: 0 st: 0 ts:2.000000 flags:1
-ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:215220 size:13087 flags:1
+ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:212738 size:14347 flags:1
 ret: 0 st:-1 ts:0.883340 flags:0
-ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:159706 size:12679 flags:1
+ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:152640 size:14348 flags:1
 ret:-1 st:-1 ts:-0.222493 flags:1
 ret:-1 st: 0 ts:2.680000 flags:0
 ret: 0 st: 0 ts:1.560000 flags:1
-ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:187334 size:12986 flags:1
+ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:182580 size:14281 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:159706 size:12679 flags:1
+ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:152640 size:14348 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
 tests/data/a-mpeg4-rc.avi