Originally committed as revision 1818 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -416,10 +416,11 @@ static int avi_write_header(AVFormatContext *s) · 415 unmodified lines | ||
| 416 | 416 | |
| 417 | 417 | if (!url_is_streamed(pb)) { |
| 418 | 418 | unsigned char tag[5]; |
| 419 | + int j; | |
| 419 | 420 | |
| 420 | 421 | /* Starting to lay out AVI OpenDML master index. |
| 421 | 422 | * We want to make it JUNK entry for now, since we'd |
| 422 | − * like to get away without making AVI and OpenDML one | |
| 423 | + * like to get away without making AVI an OpenDML one | |
| 423 | 424 | * for compatibility reasons. |
| 424 | 425 | */ |
| 425 | 426 | avi->indexes[i].entry = avi->indexes[i].ents_allocated = 0; |
| @@ -432,7 +433,8 @@ static int avi_write_header(AVFormatContext *s) · 6 unmodified lines | ||
| 432 | 433 | /* dwChunkId */ |
| 433 | 434 | put_le64(pb, 0); /* dwReserved[3] |
| 434 | 435 | put_le32(pb, 0); Must be 0. */ |
| 435 | − url_fskip(pb, AVI_MASTER_INDEX_SIZE * 4 * 4); | |
| 436 | + for (j=0; j < AVI_MASTER_INDEX_SIZE * 2; j++) | |
| 437 | + put_le64(pb, 0); | |
| 436 | 438 | end_tag(pb, avi->indexes[i].indx_start); |
| 437 | 439 | } |
| 438 | 440 | |
| @@ -2,40 +2,40 @@ ffmpeg regression test · 1 unmodified line | ||
| 2 | 2 | dda0ba041aef50a5101884291c06d4d9 *./data/a-mpeg1.mpg |
| 3 | 3 | 6713259d72260740bbddaea30631ea18 *./data/out.yuv |
| 4 | 4 | stddev: 7.58 bytes:7299072 |
| 5 | −60ead0315f310d7dd70e90fccf9cc64f *./data/a-msmpeg4v2.avi | |
| 5 | +d0dc46dd831398237a690ebbeff18b64 *./data/a-msmpeg4v2.avi | |
| 6 | 6 | 712aa6c959d1d90a78fe98657cbff19c *./data/out.yuv |
| 7 | 7 | stddev: 8.11 bytes:7602176 |
| 8 | −04c274a5e33e4ed672c96b55424a9f96 *./data/a-msmpeg4.avi | |
| 8 | +dae855177b45cbe6e40c6777f95095ef *./data/a-msmpeg4.avi | |
| 9 | 9 | 8786aa956838234fe3e48d0ef8cbd46c *./data/out.yuv |
| 10 | 10 | stddev: 8.12 bytes:7602176 |
| 11 | −fb7fb2dc6ac9b3b5f86a1312247e7ff1 *./data/a-wmv1.avi | |
| 11 | +6633a1111c734c9156729b8b7e198c17 *./data/a-wmv1.avi | |
| 12 | 12 | 7261e23fd8ad1de6efee022051b936be *./data/out.yuv |
| 13 | 13 | stddev: 8.10 bytes:7602176 |
| 14 | −b308178b516a268b69a8c4163b765388 *./data/a-wmv2.avi | |
| 14 | +30dcbbe391149d981162a1f4727c43d6 *./data/a-wmv2.avi | |
| 15 | 15 | 7261e23fd8ad1de6efee022051b936be *./data/out.yuv |
| 16 | 16 | stddev: 8.10 bytes:7602176 |
| 17 | −99bb47379a5323bb7622d584b074e727 *./data/a-h263.avi | |
| 17 | +4bf9df20cdeb1aa01115761642b4e80b *./data/a-h263.avi | |
| 18 | 18 | 545df74e0aa443499600faedd10a7065 *./data/out.yuv |
| 19 | 19 | stddev: 8.18 bytes:7602176 |
| 20 | −4a8c50bf0483b1bec7c7c3bbc3bbb2a6 *./data/a-h263p.avi | |
| 20 | +496df9fe47c457144aac4178c960ad66 *./data/a-h263p.avi | |
| 21 | 21 | 79649b61321beaaaa6413af8c18e4696 *./data/out.yuv |
| 22 | 22 | stddev: 2.05 bytes:7602176 |
| 23 | −ce7d9918b3d140acaedd249b2796a1de *./data/a-odivx.avi | |
| 23 | +170cc33e7a786288d0e190aba76ce255 *./data/a-odivx.avi | |
| 24 | 24 | c753223d02441b59704c9859dbd7ff30 *./data/out.yuv |
| 25 | 25 | stddev: 8.01 bytes:7602176 |
| 26 | −c2bae3180c0b3b7e9fcc34b2f01855ad *./data/a-huffyuv.avi | |
| 26 | +5704a082cc5c5970620123ae20566286 *./data/a-huffyuv.avi | |
| 27 | 27 | 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv |
| 28 | 28 | stddev: 0.00 bytes:7602176 |
| 29 | −306b8506ef8761e971d8e77bd8701b72 *./data/a-mpeg4-rc.avi | |
| 29 | +6a359baea7b8b22d4a77ea1415c08d9b *./data/a-mpeg4-rc.avi | |
| 30 | 30 | 580000bfe2d4359d9aa9a9415f953b3b *./data/out.yuv |
| 31 | 31 | stddev: 10.53 bytes:7145472 |
| 32 | −7fce203812794223bd238ad027522071 *./data/a-mpeg4-adv.avi | |
| 32 | +2cbab98ebef5fbd229c66fb6435bf9a2 *./data/a-mpeg4-adv.avi | |
| 33 | 33 | b54262af56f6681186fa2c44e4ef6ec7 *./data/out.yuv |
| 34 | 34 | stddev: 7.32 bytes:7602176 |
| 35 | 35 | a38cb11e3035a280f3dad3ccdff5997b *./data/a-mpeg1b.mpg |
| 36 | 36 | da8e21c7b78b7a25558dc319524b91d8 *./data/out.yuv |
| 37 | 37 | stddev: 6.32 bytes:6842368 |
| 38 | −e9d0481d7b274de05a743ed3a87b70e1 *./data/a-mjpeg.avi | |
| 38 | +07042f42b3119c39eb26537a84a451df *./data/a-mjpeg.avi | |
| 39 | 39 | f23a9e50a559e174766ee808c48fea22 *./data/out.yuv |
| 40 | 40 | stddev: 8.87 bytes:7602176 |
| 41 | 41 | 4b37703d3dc03873f99603165c0fe11e *./data/a-rv10.rm |
| @@ -1,42 +1,42 @@ | ||
| 1 | 1 | ad56436a2fc29b0a55d3a62489942b0d ff-a-ac3.rm |
| 2 | 2 | 8b40455c66bcc5d2d9d7fabe2a907c68 ff-a-ac3.rm.asf |
| 3 | −94f2f61e8659be78fa0f2bc6754737ee ff-a-h263.avi | |
| 4 | −961eef00cacc72023ccb7c0ccd45b01a ff-a-h263.avi.asf | |
| 5 | −04c7bc584ad25b96f759b8cfd5404b60 ff-a-h263p.avi | |
| 6 | −769f66c899f803313eddc3b1ca615838 ff-a-h263p.avi.asf | |
| 7 | −e770f6a63bc6cf5647499c5a9be0a675 ff-a-huffyuv.avi | |
| 8 | −badd655491442b9a0d9c71ccca62631c ff-a-huffyuv.avi.asf | |
| 9 | −3df0c33223dbf896760fc172c26e4e99 ff-a-mjpeg.avi | |
| 10 | −429749940ed2028a60c6a8e10d125279 ff-a-mjpeg.avi.asf | |
| 3 | +11a9dd761a72cf22dcb65d6378cbe2f5 ff-a-h263.avi | |
| 4 | +d12b6fa49112aca986755f5152b6ebe3 ff-a-h263.avi.asf | |
| 5 | +444935c2ef8be07b474ca509f4694808 ff-a-h263p.avi | |
| 6 | +a768a163bb74348ace83e0420a4daa39 ff-a-h263p.avi.asf | |
| 7 | +d65e24f867c9b29e602d244ed8ecec57 ff-a-huffyuv.avi | |
| 8 | +7c691cce798dd137be49772298b461db ff-a-huffyuv.avi.asf | |
| 9 | +545b8ca61487f1c92d0c6d97d122470a ff-a-mjpeg.avi | |
| 10 | +c6359a17e4aaa7012adeb9998ee5caa1 ff-a-mjpeg.avi.asf | |
| 11 | 11 | 21f8ff9f1daacd9133683bb4ea0f50a4 ff-a-mp2.mp2 |
| 12 | 12 | c593b98f0970f7d4ae2be3a7e82aa0f7 ff-a-mp2.mp2.asf |
| 13 | −9ab166f4abec4d9ba87b3c643276646e ff-a-mpeg1b.mpg | |
| 14 | −fc49dd5c8fcca8692da120c047608286 ff-a-mpeg1b.mpg.asf | |
| 15 | 13 | 2f67a20f4e2d122054ba4d2eb4e234fd ff-a-mpeg1.mpg |
| 16 | 14 | dec5676b79535bb87c268d0633fc37f1 ff-a-mpeg1.mpg.asf |
| 17 | −8ddec0df3b7b189ed93a83dcaf1da80d ff-a-mpeg4-adv.avi | |
| 18 | −0d9bfd72cb03fcc7ba710040df5aee82 ff-a-mpeg4-adv.avi.asf | |
| 19 | −2aa1de5c814160fdf4ccb1340bc64b14 ff-a-mpeg4-rc.avi | |
| 20 | −2f15bf508e0a55fffbd34c62e1bda8f3 ff-a-mpeg4-rc.avi.asf | |
| 21 | −1019dd8a6b47f9ddf82b3b462da18a45 ff-a-msmpeg4.avi | |
| 22 | −7de436541a61169c64bb9b3973813aa9 ff-a-msmpeg4.avi.asf | |
| 23 | −c0fcf607b3c7671269a43fc4d9fda6c9 ff-a-msmpeg4v2.avi | |
| 24 | −eb0a4e4d51a7595dcaf7678dc3439fc7 ff-a-msmpeg4v2.avi.asf | |
| 25 | −230824defe495692532ac1ee0f0a5923 ff-a-odivx.avi | |
| 26 | −130bebe6f4c218b36945aafd9a3b037f ff-a-odivx.avi.asf | |
| 15 | +9ab166f4abec4d9ba87b3c643276646e ff-a-mpeg1b.mpg | |
| 16 | +fc49dd5c8fcca8692da120c047608286 ff-a-mpeg1b.mpg.asf | |
| 17 | +cd4eb69ff359bc1be5c1173b4374e1a5 ff-a-mpeg4-adv.avi | |
| 18 | +f9069f8c07e8b378bfbc6a6a9d560a42 ff-a-mpeg4-adv.avi.asf | |
| 19 | +a6d61190cac45d8377b639d966941a89 ff-a-mpeg4-rc.avi | |
| 20 | +5b890b0e31a6229b1f3ca3512a678a93 ff-a-mpeg4-rc.avi.asf | |
| 21 | +5e165979319d7835de323225b582c613 ff-a-msmpeg4.avi | |
| 22 | +dd8f6a27791695faf8ca9e51f4c7f26d ff-a-msmpeg4.avi.asf | |
| 23 | +fd81fea47a391e3123110f6503a732cd ff-a-msmpeg4v2.avi | |
| 24 | +9d9cbd7c5345337c79a5ff61efc6c608 ff-a-msmpeg4v2.avi.asf | |
| 25 | +5c63e5ea93bc5e6f117406a65c529900 ff-a-odivx.avi | |
| 26 | +56d02bfe6e0321e4c8e849dcae9c677c ff-a-odivx.avi.asf | |
| 27 | 27 | 06fecb22d2b7570121ce342f09f58000 ff-a-rv10.rm |
| 28 | 28 | b5972d167cddd0dc1204feddfcea35fd ff-a-rv10.rm.asf |
| 29 | −e3ad78406c4e84a74ef64bfc819aff7b ff-a-wmv1.avi | |
| 30 | −cb18df1d019f3a8e8615eec58e357e15 ff-a-wmv1.avi.asf | |
| 31 | −a49f6b185a5e76e82013d944b3aa51c4 ff-a-wmv2.avi | |
| 32 | −6b23082933279132bd9a6cf97fbd5ee0 ff-a-wmv2.avi.asf | |
| 29 | +81777ac3db5a833c6ca3a0ff4db5a416 ff-a-wmv1.avi | |
| 30 | +56d2d8fc9c017b55df591185fbbd8093 ff-a-wmv1.avi.asf | |
| 31 | +4e19daf1395aaf3acd244d385ec533f0 ff-a-wmv2.avi | |
| 32 | +4096411f6a06d51693536a79233ff441 ff-a-wmv2.avi.asf | |
| 33 | 33 | 7ea4698fdd7fac1a16d4b99a55350612 ff-test_h.asf |
| 34 | −a461e8805caa6d3793f163f73ac632ab ff-test_h.avi | |
| 34 | +8e9c92e3e8e601e33824e0c6a6d65b5a ff-test_h.avi | |
| 35 | 35 | 25efaa1650a9e16791d4c45f440fbb37 ff-test_h.mpg |
| 36 | 36 | 8d887b4f8c99990724718c76f49d1715 ff-test_h.rm |
| 37 | 37 | 574134f491d5ad8a2cf2c42673f2b29b ff-test.jpg |
| 38 | 38 | b02019f2b2c87b35daa35913e759b46d ff-test_l.asf |
| 39 | −379020eaa40200e8f09e6e8dc0409ba4 ff-test_l.avi | |
| 39 | +66d20641acabf714a17c8415e832ad75 ff-test_l.avi | |
| 40 | 40 | cbfff532fcd765e3976c40b7add94c64 ff-test_l.mpg |
| 41 | 41 | eaf874a84f6db9407c4edad1760f8760 ff-test_l.rm |
| 42 | 42 | 4913a7aa7acb917df1817b4b8d1b2356 ff-test.mjpg |
| @@ -2,40 +2,40 @@ ffmpeg regression test · 1 unmodified line | ||
| 2 | 2 | 1738d12380be0d8aa20d08e178349299 *./data/a-mpeg1.mpg |
| 3 | 3 | 0cf790edd0f4c5cf993c2d59211b9de2 *./data/out.yuv |
| 4 | 4 | stddev: 4.91 bytes:7299072 |
| 5 | −bd0a8e71b47f6a7e1a3b7d66174b5c6e *./data/a-msmpeg4v2.avi | |
| 5 | +14db391f167b52b21a983157b410affc *./data/a-msmpeg4v2.avi | |
| 6 | 6 | fc8881e0904af9491d5fa0163183954b *./data/out.yuv |
| 7 | 7 | stddev: 5.29 bytes:7602176 |
| 8 | −6d86b5016bdca1770135fcdd77af4b0b *./data/a-msmpeg4.avi | |
| 8 | +484b4dccac1e552f0f29971f4a066598 *./data/a-msmpeg4.avi | |
| 9 | 9 | dd82e8badc40ad5f76b0ffc1d6945b1c *./data/out.yuv |
| 10 | 10 | stddev: 5.29 bytes:7602176 |
| 11 | −3a2b23230f5725aa5ef2eabb594cd076 *./data/a-wmv1.avi | |
| 11 | +d63c0cbb6d845bfd8e2735b4ea733a53 *./data/a-wmv1.avi | |
| 12 | 12 | 407c23671e7c7265c19c91966dbba317 *./data/out.yuv |
| 13 | 13 | stddev: 5.29 bytes:7602176 |
| 14 | −894207107bdeed1035eea80d1c4c6df2 *./data/a-wmv2.avi | |
| 14 | +ba4616dc4db0db636a7c26bc8f2de04e *./data/a-wmv2.avi | |
| 15 | 15 | 407c23671e7c7265c19c91966dbba317 *./data/out.yuv |
| 16 | 16 | stddev: 5.29 bytes:7602176 |
| 17 | −8595d8d211955cbabf4826b31f31f313 *./data/a-h263.avi | |
| 17 | +f980b5e38c4b919fbe5b660fe12fcf1a *./data/a-h263.avi | |
| 18 | 18 | 8bcc9f78373ec424e864b40734e124ba *./data/out.yuv |
| 19 | 19 | stddev: 5.41 bytes:7602176 |
| 20 | −e6457c7acacd0e5831a221b9dbcba38a *./data/a-h263p.avi | |
| 20 | +c7683a914f7377dd0d3c2d0be6892fe9 *./data/a-h263p.avi | |
| 21 | 21 | a63dcff871fd46481a4a7260aebbcdb5 *./data/out.yuv |
| 22 | 22 | stddev: 1.89 bytes:7602176 |
| 23 | −5078410b96832668ca82914c916e2bb1 *./data/a-odivx.avi | |
| 23 | +ea8c6216f605c3e581de70a39463aa48 *./data/a-odivx.avi | |
| 24 | 24 | 675ae0065619a2a73682f6a51ebf72d4 *./data/out.yuv |
| 25 | 25 | stddev: 5.28 bytes:7602176 |
| 26 | −9228e431ace33a47e82f3a3a117bf053 *./data/a-huffyuv.avi | |
| 26 | +242a7a18c2793e115007bc163861ef4e *./data/a-huffyuv.avi | |
| 27 | 27 | dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv |
| 28 | 28 | stddev: 0.00 bytes:7602176 |
| 29 | −1cf2ebe199f4db19ab7357c485577d7e *./data/a-mpeg4-rc.avi | |
| 29 | +2a9ee5a50073e3c5c25653f83d2b78ae *./data/a-mpeg4-rc.avi | |
| 30 | 30 | 6851f0023a361b2b088d115f6d42d03e *./data/out.yuv |
| 31 | 31 | stddev: 5.12 bytes:7145472 |
| 32 | −80b436826a1ed11b0479399f8bdf531d *./data/a-mpeg4-adv.avi | |
| 32 | +aeb300900461bdf9e0321934aa6dcc93 *./data/a-mpeg4-adv.avi | |
| 33 | 33 | e465df12f2c8a6492a6ec0b1bddc1d0d *./data/out.yuv |
| 34 | 34 | stddev: 4.97 bytes:7602176 |
| 35 | 35 | 2ec827a941ee8e82911280405987f8ef *./data/a-mpeg1b.mpg |
| 36 | 36 | 145c3741d70bc40d5c93de709aca70ee *./data/out.yuv |
| 37 | 37 | stddev: 4.12 bytes:6842368 |
| 38 | −b9c68a20e7dacbd1c47e770f57ebec66 *./data/a-mjpeg.avi | |
| 38 | +e9218a1db885fe0262e88f9df630307d *./data/a-mjpeg.avi | |
| 39 | 39 | a365b4da246ad68caf96b702b7f961a1 *./data/out.yuv |
| 40 | 40 | stddev: 4.76 bytes:7602176 |
| 41 | 41 | 1b46671251277c14f3a24a034648c458 *./data/a-rv10.rm |
| @@ -1,5 +1,12 @@ | ||
| 1 | 1 | #!/bin/bash |
| 2 | − | |
| 2 | +# Even in the 21st century some diffs are not supporting -u. | |
| 3 | +diff -u $0 $0 > /dev/null 2>&1 | |
| 4 | +if [ $? -eq 0 ]; then | |
| 5 | + diff_cmd="diff -u" | |
| 6 | +else | |
| 7 | + diff_cmd="diff" | |
| 8 | +fi | |
| 9 | + | |
| 3 | 10 | # Make sure that the data directory exists |
| 4 | 11 | mkdir -p data |
| 5 | 12 | |
| @@ -22,7 +29,7 @@ sleep 2 · 16 unmodified lines | ||
| 22 | 29 | if [ `expr match $file "a-*"` -ne 0 ]; then |
| 23 | 30 | wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file > ff-$file & |
| 24 | 31 | else |
| 25 | − wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file?date=19700101T000000Z | head --bytes=100000 > ff-$file & | |
| 32 | + wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file?date=19700101T000000Z | dd bs=1 count=100000 > ff-$file 2>/dev/null & | |
| 26 | 33 | fi |
| 27 | 34 | MDFILES="$MDFILES ff-$file" |
| 28 | 35 | done |
| @@ -32,7 +39,7 @@ sleep 2 · 3 unmodified lines | ||
| 32 | 39 | ) |
| 33 | 40 | kill $FFSERVER_PID |
| 34 | 41 | wait > /dev/null 2>&1 |
| 35 | −if diff -u data/ffserver.regression $1 ; then | |
| 42 | +if $diff_cmd data/ffserver.regression $1 ; then | |
| 36 | 43 | echo |
| 37 | 44 | echo Server regression test succeeded. |
| 38 | 45 | exit 0 |