[SCM] libav/experimental: sample_size fix
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:43:22 UTC 2013
The following commit has been merged in the experimental branch:
commit 4a7d265176accd6d5b4b8cd6c960ca087e07a7ec
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Mar 15 23:50:24 2005 +0000
sample_size fix
Originally committed as revision 4043 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 3fcee51..daaa151 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -396,7 +396,7 @@ static int avi_write_header(AVFormatContext *s)
put_le32(pb, nb_frames); /* length, XXX: fill later */
put_le32(pb, 1024 * 1024); /* suggested buffer size */
put_le32(pb, -1); /* quality */
- put_le32(pb, stream->width * stream->height * 3); /* sample size */
+ put_le32(pb, 0); /* sample size */
put_le16(pb, 0);
put_le16(pb, 0);
put_le16(pb, stream->width);
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 2445aa6..01e5e00 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -23,31 +23,31 @@ stddev: 7.64 PSNR:30.45 bytes:7602176
2115703 ./data/a-mpeg2reuse.mpg
526e6e6818296a1b63d91fc165e0bda8 *./data/out.yuv
stddev: 7.68 PSNR:30.41 bytes:7602176
-e7ff3a8780ebdc6687352646c8fbe876 *./data/a-msmpeg4v2.avi
+09086e7b020e9425a8f7e05372dbcfcd *./data/a-msmpeg4v2.avi
642666 ./data/a-msmpeg4v2.avi
7646e5cc93452b5fb380c8c4c5f535f4 *./data/out.yuv
stddev: 8.02 PSNR:30.03 bytes:7602176
-acd696f8967a996b3fbcfac94dd0d889 *./data/a-msmpeg4.avi
+2a7548673b1fdddbb91e2a16698a6249 *./data/a-msmpeg4.avi
644964 ./data/a-msmpeg4.avi
cdc5d7403a16dc9450a2dbacb349dc70 *./data/out.yuv
stddev: 8.01 PSNR:30.04 bytes:7602176
-82ca511f87695a1ee24c1681fed75bfa *./data/a-wmv1.avi
+199d97760f89a27406ab1c36eeb86045 *./data/a-wmv1.avi
648074 ./data/a-wmv1.avi
09253222ab4eb95628c931a86006a2b1 *./data/out.yuv
stddev: 8.02 PSNR:30.04 bytes:7602176
-a5bd577163968edab00058f2c8d5efab *./data/a-wmv2.avi
+1224b828b077ea06d07f60e2b5d65daa *./data/a-wmv2.avi
682132 ./data/a-wmv2.avi
09253222ab4eb95628c931a86006a2b1 *./data/out.yuv
stddev: 8.02 PSNR:30.04 bytes:7602176
-bcf34887269746ac7973f88cde336609 *./data/a-h261.avi
+83aa4946c21cd3b2b053638302a6bc64 *./data/a-h261.avi
735098 ./data/a-h261.avi
0a6e6dd4f09df9fe77ff29581c1a39c3 *./data/out.yuv
stddev: 9.14 PSNR:28.90 bytes:7602176
-fa556e599181bf9328a811a1ce9aa022 *./data/a-h263.avi
+e73d7a4cad997f18587dff27094fb8f4 *./data/a-h263.avi
682226 ./data/a-h263.avi
f2b7fcff9de17f5aecfeb1090fe1963b *./data/out.yuv
stddev: 8.08 PSNR:29.97 bytes:7602176
-fb27fbe102cae4d8b7c47955db87b11d *./data/a-h263p.avi
+fc01a5723a0d629bb73c74d64692120d *./data/a-h263p.avi
2414342 ./data/a-h263p.avi
28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv
stddev: 2.07 PSNR:41.76 bytes:7602176
@@ -55,31 +55,31 @@ stddev: 2.07 PSNR:41.76 bytes:7602176
554440 ./data/a-odivx.mp4
e400c9175dd1811cdeee7be5555d33f1 *./data/out.yuv
stddev: 7.99 PSNR:30.06 bytes:7602176
-b415b4d46c0c693d973dd45b1898de52 *./data/a-huffyuv.avi
+8a9a98678a2e9c2e857f741cbb8e9ccb *./data/a-huffyuv.avi
7932708 ./data/a-huffyuv.avi
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176
-d41e47df8f3fc5a5637ae131bec73357 *./data/a-mpeg4-rc.avi
+24f8d8a1c15c078f1f1e443b85688444 *./data/a-mpeg4-rc.avi
820964 ./data/a-mpeg4-rc.avi
8458b4ddaca643a3ec1264c1ee2f4986 *./data/out.yuv
stddev: 10.41 PSNR:27.77 bytes:7602176
-560b3f13ee58a5b2aa06800c52f8369b *./data/a-mpeg4-adv.avi
+81078d7852dfd6041ff17b5dc8ed0ffc *./data/a-mpeg4-adv.avi
600240 ./data/a-mpeg4-adv.avi
0b7935cee2070f3b838478cea6dc4b3c *./data/out.yuv
stddev: 10.25 PSNR:27.90 bytes:7602176
-9b788dd09a63c61f71f098cc1fd77667 *./data/a-mpeg4-thread.avi
+c5478162c76db62162b082594c4e7ee1 *./data/a-mpeg4-thread.avi
756550 ./data/a-mpeg4-thread.avi
7e4e2cf2659aa158f5ffed2be45a9c3d *./data/out.yuv
stddev: 12.31 PSNR:26.31 bytes:7602176
-d8fba962b145ef47f346db63dbfcd04c *./data/a-mpeg4-Q.avi
+50867a2530035615152f1e068c989bfc *./data/a-mpeg4-Q.avi
899514 ./data/a-mpeg4-Q.avi
cdb77818e108eab89c9ac4bcaf350e19 *./data/out.yuv
stddev: 5.69 PSNR:33.00 bytes:7602176
-8a9af311aada1d907ab39fefe7b60362 *./data/a-error-mpeg4-adv.avi
+f89ab211c5a4a0267fc0318c02d735ca *./data/a-error-mpeg4-adv.avi
750788 ./data/a-error-mpeg4-adv.avi
83c96db61822c4ee2b9d46f1055264c5 *./data/out.yuv
stddev: 17.22 PSNR:23.40 bytes:7602176
-9a844a09f0c58b8770b70c3eaad32e3d *./data/a-mpeg4-nr.avi
+adf36cbca712f8202d474cf1f99bdcd0 *./data/a-mpeg4-nr.avi
689772 ./data/a-mpeg4-nr.avi
79f4e8263e40822c0cbf35725f375b24 *./data/out.yuv
stddev: 7.03 PSNR:31.18 bytes:7602176
@@ -87,11 +87,11 @@ stddev: 7.03 PSNR:31.18 bytes:7602176
1037657 ./data/a-mpeg1b.mpg
09a77de112e144c562bc1398b111b61b *./data/out.yuv
stddev: 6.35 PSNR:32.06 bytes:7602176
-8e69394fdcb19995dfe5cb8c562d9441 *./data/a-mjpeg.avi
+f7562207c0e7490e570c91c2900b73f6 *./data/a-mjpeg.avi
1566544 ./data/a-mjpeg.avi
18c3a76f984e717dd886d21fa04355f6 *./data/out.yuv
stddev: 7.93 PSNR:30.13 bytes:7602176
-a534c6fc190682842efc0defda2cd442 *./data/a-ljpeg.avi
+7e434004d285155cf81ed206bb387870 *./data/a-ljpeg.avi
6263462 ./data/a-ljpeg.avi
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176
@@ -103,11 +103,11 @@ a00fbb82c030fe41febe1d03eacb338e *./data/a-rv20.rm
652897 ./data/a-rv20.rm
203e9790cb25b1d308fd602275afbb0e *./data/out.yuv
stddev: 8.27 PSNR:29.76 bytes:7602176
-bee98096658646b9484251b264dcf66f *./data/a-asv1.avi
+98c310d768d0bee325424f6e1cd92548 *./data/a-asv1.avi
1487828 ./data/a-asv1.avi
925320b74c7dfda5dc8378dd879ae2c3 *./data/out.yuv
stddev: 20.00 PSNR:22.10 bytes:7602176
-3cff5590a76ad2a157d6accc36b575fd *./data/a-asv2.avi
+629fe6fdebcd295e0ad76f5bbaf3abec *./data/a-asv2.avi
1453500 ./data/a-asv2.avi
0b310840a6d3970595983491687669df *./data/out.yuv
stddev: 18.82 PSNR:22.63 bytes:7602176
@@ -115,7 +115,7 @@ de42cb5a15bfa8e70cf60edda0b32355 *./data/a-flv.flv
657991 ./data/a-flv.flv
4d9c04e7017dc68da7891048c46c1c37 *./data/out.yuv
stddev: 8.08 PSNR:29.97 bytes:7602176
-255e21b18af133a5196551aac321b5eb *./data/a-ffv1.avi
+a7ef4746f27be309138c188e327d3ebe *./data/a-ffv1.avi
2653642 ./data/a-ffv1.avi
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index c1aef18..c4c29a2 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -1,5 +1,5 @@
ffmpeg regression test
-d86f2c98dfa2c410c98b4eb9c88be2b2 *./data/b-libav.avi
+9f2252939564a3b735605be5e6575f04 *./data/b-libav.avi
342282 ./data/b-libav.avi
./data/b-libav.avi CRC=ccab3a27
c83444a0e8ef47b6af1d868d1bb21696 *./data/b-libav.asf
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 9a9e5c8..d3c9276 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -23,31 +23,31 @@ stddev: 4.76 PSNR:34.56 bytes:7602176
397244 ./data/a-mpeg2reuse.mpg
caa7723366dd267a5a14775565f2df2e *./data/out.yuv
stddev: 4.77 PSNR:34.54 bytes:7602176
-fe0779aa87f6e30c450944c807afb13a *./data/a-msmpeg4v2.avi
+dc68a5115d1bf1bb2eb2ce9bb237bd79 *./data/a-msmpeg4v2.avi
129504 ./data/a-msmpeg4v2.avi
25b5ba0b024fcd4028e707ffbeb80f55 *./data/out.yuv
stddev: 5.33 PSNR:33.57 bytes:7602176
-a582969be47fc3ea84c42523b6a08ee9 *./data/a-msmpeg4.avi
+261326db3c2561889c53da3c395af4b2 *./data/a-msmpeg4.avi
127110 ./data/a-msmpeg4.avi
638e64258f26330f3cd36d8d2bbc73f5 *./data/out.yuv
stddev: 5.33 PSNR:33.57 bytes:7602176
-29c763afd1986210e43e42d4a0f407a5 *./data/a-wmv1.avi
+a931648e881765ff168239440b772842 *./data/a-wmv1.avi
128880 ./data/a-wmv1.avi
f80d2809e79af3ebcfe831deab9af03c *./data/out.yuv
stddev: 5.33 PSNR:33.58 bytes:7602176
-191d41c2bd34dc99367c43c466be313e *./data/a-wmv2.avi
+38ad36644b4521607f56cb4f7fbb6114 *./data/a-wmv2.avi
129214 ./data/a-wmv2.avi
f80d2809e79af3ebcfe831deab9af03c *./data/out.yuv
stddev: 5.33 PSNR:33.58 bytes:7602176
-631f4daabb4f639e8dec18bbb58dae79 *./data/a-h261.avi
+0423035ddc9aeb8a0b2c29f1d202e0ad *./data/a-h261.avi
191124 ./data/a-h261.avi
452714d0883f555e831888de0be1fc49 *./data/out.yuv
stddev: 6.39 PSNR:32.00 bytes:7602176
-ef053b1fec77a49eb8a27510b81e4041 *./data/a-h263.avi
+f02f10a94fc39a7518141bef9e532bd2 *./data/a-h263.avi
159596 ./data/a-h263.avi
7ec66fb7dd4e5dddd3820c668d6636aa *./data/out.yuv
stddev: 5.44 PSNR:33.41 bytes:7602176
-0922e8721ebf48a8d7391285f79ecd78 *./data/a-h263p.avi
+804a8facc831125842453fb3b7016735 *./data/a-h263p.avi
868164 ./data/a-h263p.avi
80fb224bebbe2e04f228da7485b905c5 *./data/out.yuv
stddev: 1.91 PSNR:42.49 bytes:7602176
@@ -55,31 +55,31 @@ stddev: 1.91 PSNR:42.49 bytes:7602176
120196 ./data/a-odivx.mp4
8b7657a7f9fc7298cc016abb466d1d19 *./data/out.yuv
stddev: 5.34 PSNR:33.56 bytes:7602176
-eb6a67c8bc0df5dd1bef308e776fe193 *./data/a-huffyuv.avi
+4a8912deb0182471aaaf4fc3ece39fb2 *./data/a-huffyuv.avi
6454196 ./data/a-huffyuv.avi
dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176
-7de34451360350e522c13423b96e5026 *./data/a-mpeg4-rc.avi
+540bdc49a339db675d12cffc9fce2454 *./data/a-mpeg4-rc.avi
228094 ./data/a-mpeg4-rc.avi
764d5da4f1c8eda9bd554179ed1ea283 *./data/out.yuv
stddev: 4.26 PSNR:35.51 bytes:7602176
-da7f358a53317d2cae88bcb10a5bf9df *./data/a-mpeg4-adv.avi
+6844785bcca74b4b9dc77ce6d21a3871 *./data/a-mpeg4-adv.avi
172538 ./data/a-mpeg4-adv.avi
49fecc1105d25ff1c2fc9c0d4cb821b0 *./data/out.yuv
stddev: 4.84 PSNR:34.41 bytes:7602176
-c3159291727b7aa37913f8962ce941e1 *./data/a-mpeg4-thread.avi
+d5f2da1edcf1979d71bec183e461b5aa *./data/a-mpeg4-thread.avi
253098 ./data/a-mpeg4-thread.avi
da1a5a3301ad2bdf5806a51ffa74d4fb *./data/out.yuv
stddev: 4.06 PSNR:35.93 bytes:7602176
-0961493eb3cfc37d62e3206e56143113 *./data/a-mpeg4-Q.avi
+ddcb9476113fac71ee609018984353ce *./data/a-mpeg4-Q.avi
165016 ./data/a-mpeg4-Q.avi
94d8bd3897ac20bb3bef9cf384f9abd0 *./data/out.yuv
stddev: 4.01 PSNR:36.05 bytes:7602176
-e03781f2ff74529cb4bd2af27a9ff961 *./data/a-error-mpeg4-adv.avi
+217c694a61eea2dd8896d558fed3fc05 *./data/a-error-mpeg4-adv.avi
175778 ./data/a-error-mpeg4-adv.avi
62106b2ae4c1cfc985face2dadb90cbc *./data/out.yuv
stddev: 10.05 PSNR:28.08 bytes:7602176
-e9c50d0b5ff0b9edbd3049943124fa49 *./data/a-mpeg4-nr.avi
+75aeb8364b81a458af5523c4a2bfdb39 *./data/a-mpeg4-nr.avi
154392 ./data/a-mpeg4-nr.avi
33a6f702049ef4e074c6266b9d17d3e9 *./data/out.yuv
stddev: 4.73 PSNR:34.61 bytes:7602176
@@ -87,11 +87,11 @@ stddev: 4.73 PSNR:34.61 bytes:7602176
231306 ./data/a-mpeg1b.mpg
c665bd56f8e241f8bf3a5a8f803227c3 *./data/out.yuv
stddev: 4.13 PSNR:35.78 bytes:7602176
-fab9b15954fe07a7d94ea4fa02af1ca2 *./data/a-mjpeg.avi
+213976bbab45a461e3334feb8fef38d9 *./data/a-mjpeg.avi
702528 ./data/a-mjpeg.avi
b1aa72cfb6f9cc3f525b27abc86a8f51 *./data/out.yuv
stddev: 4.38 PSNR:35.28 bytes:7602176
-29d6f3ca0833ed83cffa279d08e79419 *./data/a-ljpeg.avi
+438065c90b5fbec7c670fbf4eb70f24d *./data/a-ljpeg.avi
4765522 ./data/a-ljpeg.avi
dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176
@@ -103,11 +103,11 @@ d4a6977b0162d8c1cfea5ffd0a3d5f56 *./data/a-rv20.rm
133224 ./data/a-rv20.rm
fce5eda7118cbb0bd60da60e827842ee *./data/out.yuv
stddev: 5.42 PSNR:33.43 bytes:7602176
-7f88a66bbb1265f5b29194dd94686e3d *./data/a-asv1.avi
+5e6ad8292d66d4aff3dfcbdc61696c94 *./data/a-asv1.avi
831476 ./data/a-asv1.avi
c96ff7fd17c52f99ddb7922a4cb9168f *./data/out.yuv
stddev: 10.47 PSNR:27.72 bytes:7602176
-b4252e28e934a49ce24676389604393e *./data/a-asv2.avi
+f41877971145f58fae85c613ec570d66 *./data/a-asv2.avi
788036 ./data/a-asv2.avi
74a78015b64b2cf8cb9da2e44f508a69 *./data/out.yuv
stddev: 10.28 PSNR:27.88 bytes:7602176
@@ -115,7 +115,7 @@ d847c144e7b72027531047ea4c441cbf *./data/a-flv.flv
131771 ./data/a-flv.flv
e61cd1e7c5a292d396ae90f4d2fb3db7 *./data/out.yuv
stddev: 5.33 PSNR:33.57 bytes:7602176
-35600c92a9e2067ee452816b863a5012 *./data/a-ffv1.avi
+d0831a8339491fd680b650f05262e5d9 *./data/a-ffv1.avi
3524768 ./data/a-ffv1.avi
dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list