diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 8a60ff08b4..6c396b3b04 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -1785,7 +1785,7 @@ static void init_mv_penalty_and_fcode(MpegEncContext *s) else{ int val, bit_size, range, code; - bit_size = s->f_code - 1; + bit_size = f_code - 1; range = 1 << bit_size; val=mv; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index f3d118469d..2b5d0749bd 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -796,7 +796,7 @@ void ff_mpeg1_encode_init(MpegEncContext *s) else{ int val, bit_size, range, code; - bit_size = s->f_code - 1; + bit_size = f_code - 1; range = 1 << bit_size; val=mv; diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index 950bb44b3c..64c7bb0acc 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -1,57 +1,57 @@ ffmpeg regression test -74e25b401f34321aeb854e264ef62df8 *./data/a-mpeg1.mpg -1ee8816bd078efe66be0090b1d9b0af1 *./data/out.yuv -stddev: 7.63 PSNR:30.47 bytes:7602176 -b588110bebb48b5a1815ac26d0f0c9cc *./data/a-mpeg2.mpg -ddfa5c618dab54df0f47976ddd55d90f *./data/out.yuv -stddev: 7.65 PSNR:30.44 bytes:7602176 -ce0529fb56f9e2e89545227b7ed669a4 *./data/a-mpeg2i.mpg -446cb12ef18f799058634faa1c163f48 *./data/out.yuv -stddev: 7.66 PSNR:30.44 bytes:7602176 -201a9264b462ab6e33509173da5e93f0 *./data/a-mpeg2thread.mpg -593267186722d7906aff1836613952a0 *./data/out.yuv -stddev: 9.44 PSNR:28.62 bytes:7299072 -d0dc46dd831398237a690ebbeff18b64 *./data/a-msmpeg4v2.avi -712aa6c959d1d90a78fe98657cbff19c *./data/out.yuv -stddev: 8.11 PSNR:29.94 bytes:7602176 -dae855177b45cbe6e40c6777f95095ef *./data/a-msmpeg4.avi -8786aa956838234fe3e48d0ef8cbd46c *./data/out.yuv -stddev: 8.12 PSNR:29.93 bytes:7602176 -6633a1111c734c9156729b8b7e198c17 *./data/a-wmv1.avi -7261e23fd8ad1de6efee022051b936be *./data/out.yuv -stddev: 8.10 PSNR:29.94 bytes:7602176 -30dcbbe391149d981162a1f4727c43d6 *./data/a-wmv2.avi -7261e23fd8ad1de6efee022051b936be *./data/out.yuv -stddev: 8.10 PSNR:29.94 bytes:7602176 -48bc3eb55962ebb5a78359727d2bf4d8 *./data/a-h263.avi -545df74e0aa443499600faedd10a7065 *./data/out.yuv -stddev: 8.18 PSNR:29.86 bytes:7602176 -a1b02aeff25b40cca5d22fcf26dcc36d *./data/a-h263p.avi -0eb167c9dfcbeeecbf3debed8af8f811 *./data/out.yuv -stddev: 2.08 PSNR:41.74 bytes:7602176 -3f7cb6411a099cdeda089fa9f720f17a *./data/a-odivx.mp4 -d0d19e18c9d7b6fecaa7f9fc68691d89 *./data/out.yuv -stddev: 7.94 PSNR:30.12 bytes:7602176 +8fa6d3f1c07df017507508e5b4f66580 *./data/a-mpeg1.mpg +85d76325d3eda9e9db6480f340f5dcd8 *./data/out.yuv +stddev: 7.66 PSNR:30.43 bytes:7602176 +d407d83f6fa7c98468a6f69a40bdc6a0 *./data/a-mpeg2.mpg +d2421f070ffc974735cb53d3cac687c7 *./data/out.yuv +stddev: 7.68 PSNR:30.41 bytes:7602176 +d295328b9860a8daf49e783e7644b566 *./data/a-mpeg2i.mpg +4acf1008a49f18b9ab632d2470bdc22a *./data/out.yuv +stddev: 7.70 PSNR:30.39 bytes:7602176 +6c56dbcc64f2f4ba27d4c6192365524b *./data/a-mpeg2thread.mpg +d0fe7723b7379f7c9d565b79207655ca *./data/out.yuv +stddev: 9.45 PSNR:28.61 bytes:7299072 +1a919f76063089fef246790165b34e37 *./data/a-msmpeg4v2.avi +2425680bd5c78671e03d2fee4563d98b *./data/out.yuv +stddev: 8.03 PSNR:30.02 bytes:7602176 +bff91a624ca3996ea3456811911e6eaf *./data/a-msmpeg4.avi +3e99954eafce6f339558a8703f2ffb51 *./data/out.yuv +stddev: 8.03 PSNR:30.02 bytes:7602176 +cd2638da04fab94255c4198362ca9b65 *./data/a-wmv1.avi +a58f8ab3f3735b3f1cc6c08917bb3ef3 *./data/out.yuv +stddev: 8.03 PSNR:30.02 bytes:7602176 +8729cdb1d0c0f67f601c3326e3042709 *./data/a-wmv2.avi +a58f8ab3f3735b3f1cc6c08917bb3ef3 *./data/out.yuv +stddev: 8.03 PSNR:30.02 bytes:7602176 +6febe9fd5e4fb1077fc56b4d69a92e56 *./data/a-h263.avi +bb31a08b20cfabc5332d11938e2f9352 *./data/out.yuv +stddev: 8.09 PSNR:29.96 bytes:7602176 +fea5b6c80b5e345cc48f72257814d7b8 *./data/a-h263p.avi +c6e070fb9505018402c5b87b8b12699d *./data/out.yuv +stddev: 2.07 PSNR:41.77 bytes:7602176 +049bf57a9f36b508bcea39de8a6e3453 *./data/a-odivx.mp4 +33d3e1f41f1dcb99676e661ba9aa766f *./data/out.yuv +stddev: 8.05 PSNR:30.00 bytes:7602176 5704a082cc5c5970620123ae20566286 *./data/a-huffyuv.avi 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -e9f63126859b97cd23cd1413038f8f7b *./data/a-mpeg4-rc.avi -90a159074b1b109569914ee63f387860 *./data/out.yuv -stddev: 10.18 PSNR:27.96 bytes:7145472 -6a91dc8f522608b0697886c939607791 *./data/a-mpeg4-adv.avi -a1ad0c3b1652c50dfa3a97b97f984a49 *./data/out.yuv -stddev: 10.23 PSNR:27.92 bytes:7602176 -1b330a9b4c5e25256934eaf829c77595 *./data/a-mpeg4-thread.avi -d9322fbe12677e4805a4ca855f33a636 *./data/out.yuv -stddev: 12.09 PSNR:26.47 bytes:7145472 -85c5eb303db25bb0556dc05cdd2dacad *./data/a-error-mpeg4-adv.avi -7ed8deb5c26930f4b77559b5fab9d5d3 *./data/out.yuv -stddev: 17.38 PSNR:23.32 bytes:7602176 -4f288e46f8db954a31e1e4e1a7cd6aa8 *./data/a-mpeg4-nr.avi -b0b2814c888b987c75c204a82b8e5ab0 *./data/out.yuv -stddev: 7.02 PSNR:31.19 bytes:7602176 -30514877003cecd3f976ff377871511f *./data/a-mpeg1b.mpg -788a9d500dc8986231a18076fc80fd73 *./data/out.yuv +a06eb02738bc67c61392fe2fced2afa9 *./data/a-mpeg4-rc.avi +8bcc9847ceab4b879d69fcd904747d18 *./data/out.yuv +stddev: 10.11 PSNR:28.02 bytes:7145472 +451bd18acf3c169301c215a63a3b216d *./data/a-mpeg4-adv.avi +9f4fbff593dd0bd7ad437ceee4afc11f *./data/out.yuv +stddev: 10.31 PSNR:27.85 bytes:7602176 +3424145af47f83c77bd42f4707c1a722 *./data/a-mpeg4-thread.avi +7e07f0c47f02b87e713be9c5d435f9c2 *./data/out.yuv +stddev: 12.04 PSNR:26.50 bytes:7145472 +771f65ff24c0d32b37f2663892b2f433 *./data/a-error-mpeg4-adv.avi +d1b3c33516dc7d732d686dc59ab799b3 *./data/out.yuv +stddev: 18.05 PSNR:22.99 bytes:7602176 +dccfbd47aad26b096c9857bfb251ec85 *./data/a-mpeg4-nr.avi +67f8e8839fd8354e8f08661e3a7fdb88 *./data/out.yuv +stddev: 7.04 PSNR:31.17 bytes:7602176 +dea1962da88ad3922a9c222bec94a3c1 *./data/a-mpeg1b.mpg +cb6358640f9c3f9cbc6bbccef544374a *./data/out.yuv stddev: 10.07 PSNR:28.06 bytes:7145472 07042f42b3119c39eb26537a84a451df *./data/a-mjpeg.avi f23a9e50a559e174766ee808c48fea22 *./data/out.yuv @@ -59,18 +59,18 @@ stddev: 8.87 PSNR:29.15 bytes:7602176 1d565db4a3a054261af95f2483a37cd6 *./data/a-ljpeg.avi 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -4b37703d3dc03873f99603165c0fe11e *./data/a-rv10.rm -255469fef47bee94cfb2e3385ebb736b *./data/out.yuv -stddev: 13.42 PSNR:25.56 bytes:7602176 +4fcfeba819177ad440bd16b0f095ba45 *./data/a-rv10.rm +9092124e1694baf96c1abc4fed26e072 *./data/out.yuv +stddev: 14.17 PSNR:25.09 bytes:7602176 89ad858355f9b0a92d024c5ba6e369dd *./data/a-asv1.avi b3e1696d73071c8f7f0ff4e10c1677ca *./data/out.yuv stddev: 19.19 PSNR:22.46 bytes:7602176 3909db39c3d2e9a72a952254e8685ff7 *./data/a-asv2.avi 551b263bfb2acb9ea6dd2000f184494f *./data/out.yuv stddev: 17.98 PSNR:23.02 bytes:7602176 -37a528aa9efc28c5c3cc8191da90e012 *./data/a-flv.flv -57ea0821ec4377e96647adc22717a4ba *./data/out.yuv -stddev: 8.19 PSNR:29.85 bytes:7602176 +0bf9da6639ff5e7d4e02143ca05258f4 *./data/a-flv.flv +1f9ec1f6c8c5ad795c44183b225d842c *./data/out.yuv +stddev: 8.09 PSNR:29.96 bytes:7602176 0ed9b02681d6d44bf8c390ba6c4f5c66 *./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 269db92d8e..84cdfccbe5 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -1,19 +1,19 @@ ffmpeg regression test -3dc28f3e65addfcf907624805e92c34e *./data/b-libav.avi -./data/b-libav.avi CRC=a08a5739 -b096c8d8a022d69457fac6fcd6d008a1 *./data/b-libav.asf +c23bbe3016afcb726a494858b7bb17e3 *./data/b-libav.avi +./data/b-libav.avi CRC=658838d9 +b166e89a9ec8c707573329d883c1b6f9 *./data/b-libav.asf ./data/b-libav.asf CRC=525fdb22 -59c71a1bef09beb4a4e6f203967d12de *./data/b-libav.rm -a2ac19d68574d38e84138e0b06e609c2 *./data/b-libav.mpg -./data/b-libav.mpg CRC=b67a9677 -dde4b41bc9a9a182242108318aa70903 *./data/b-libav.swf -./data/b-libav.swf CRC=066545e4 -964bf9fc730fa66e449b6670b705a56f *./data/b-libav.flv -./data/b-libav.flv CRC=e2e5bc81 -18aa7c7be11e414ea11043f6de256d51 *./data/b-libav.mov -./data/b-libav.mov CRC=8965cc31 -1422e60a67928a2d308bab86cce46721 *./data/b-libav.nut -./data/b-libav.nut CRC=85260e12 +be8eb1b5705c8105e4727258e448cb24 *./data/b-libav.rm +072645ee8b36e432227cf9dff21561f0 *./data/b-libav.mpg +./data/b-libav.mpg CRC=eda0e29e +01a4130e776b8955fa99e477113e94fd *./data/b-libav.swf +./data/b-libav.swf CRC=eaaf4640 +9d1a1e4d23f16ecee9ad46f913acbbe0 *./data/b-libav.flv +./data/b-libav.flv CRC=8a731c32 +2759fdd5f1014abfefe36376649c9c90 *./data/b-libav.mov +./data/b-libav.mov CRC=1bd6add1 +fb191b2d08006f875c59940ec25abf10 *./data/b-libav.nut +./data/b-libav.nut CRC=d6279a86 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm ./data/b-libav.pbm CRC=a1057fd1 6ea0e1faf08f6fcdb44db4a104361b57 *./data/b-libav.pgm diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index b4118220c8..eb2fe96c0d 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -1,76 +1,76 @@ ffmpeg regression test -a6ccb5e768c7bed7a08f8e4343d81871 *./data/a-mpeg1.mpg -9364e15902bc56603dfb453f8bf146e0 *./data/out.yuv -stddev: 4.93 PSNR:34.25 bytes:7602176 -aa0f088777131d8ffb627e6ff37312ca *./data/a-mpeg2.mpg -830e7d798089ea6213e0867fd7676fde *./data/out.yuv -stddev: 4.95 PSNR:34.22 bytes:7602176 -6da01fd0d910fbfcdc5b212ef3dd65cb *./data/a-mpeg2i.mpg -1e21fd7ed53abf352f9ea8548afa80a3 *./data/out.yuv -stddev: 4.96 PSNR:34.20 bytes:7602176 -a3dd9c2911c9556d377ab1465f7365b4 *./data/a-mpeg2thread.mpg -8cf98fa5c59c959e35389a1a7180b379 *./data/out.yuv -stddev: 5.55 PSNR:33.22 bytes:7299072 -14db391f167b52b21a983157b410affc *./data/a-msmpeg4v2.avi -fc8881e0904af9491d5fa0163183954b *./data/out.yuv -stddev: 5.29 PSNR:33.64 bytes:7602176 -484b4dccac1e552f0f29971f4a066598 *./data/a-msmpeg4.avi -dd82e8badc40ad5f76b0ffc1d6945b1c *./data/out.yuv -stddev: 5.29 PSNR:33.64 bytes:7602176 -d63c0cbb6d845bfd8e2735b4ea733a53 *./data/a-wmv1.avi -407c23671e7c7265c19c91966dbba317 *./data/out.yuv -stddev: 5.29 PSNR:33.65 bytes:7602176 -ba4616dc4db0db636a7c26bc8f2de04e *./data/a-wmv2.avi -407c23671e7c7265c19c91966dbba317 *./data/out.yuv -stddev: 5.29 PSNR:33.65 bytes:7602176 -bc321858c3b669ac2c2f47eca275c7d5 *./data/a-h263.avi -8bcc9f78373ec424e864b40734e124ba *./data/out.yuv -stddev: 5.41 PSNR:33.45 bytes:7602176 -a5384185eca920b9f00d3716c38d118d *./data/a-h263p.avi -7d39d1f272205a6a231d0e0baf32ff9d *./data/out.yuv -stddev: 1.91 PSNR:42.49 bytes:7602176 -cc1373233f8d1334091b8d3594f240e0 *./data/a-odivx.mp4 -19fad75bd384b38f08830bfa19c06183 *./data/out.yuv -stddev: 5.27 PSNR:33.67 bytes:7602176 +c6b36c115af94ee79676127b48151d59 *./data/a-mpeg1.mpg +9694a38d15c5f1354112870b0709e800 *./data/out.yuv +stddev: 5.03 PSNR:34.07 bytes:7602176 +8a7a3b90f1fac5e207f3e9e3cdf11197 *./data/a-mpeg2.mpg +686d5937aec5c8ffd3a7be5363580b79 *./data/out.yuv +stddev: 5.05 PSNR:34.04 bytes:7602176 +3f5ee459440c4bc5f9fd8f53e2591073 *./data/a-mpeg2i.mpg +07f678cfa5f1c81657dadbc820d20841 *./data/out.yuv +stddev: 5.06 PSNR:34.02 bytes:7602176 +6771f3dc7a0e2b724154d4b199d6a444 *./data/a-mpeg2thread.mpg +9c84329b36d4faf8b8f4a3b810f29f92 *./data/out.yuv +stddev: 5.65 PSNR:33.07 bytes:7299072 +6ba5ea7ae12d98a2dc85cbb928f31e77 *./data/a-msmpeg4v2.avi +ab4f0d19340243a1881ae370579a37eb *./data/out.yuv +stddev: 5.44 PSNR:33.41 bytes:7602176 +60ec057386c846f1f396daeca8709d88 *./data/a-msmpeg4.avi +a277f31a93c02ea241a5c4147d8c19cf *./data/out.yuv +stddev: 5.44 PSNR:33.40 bytes:7602176 +7c8b38a496845c079ea95434937397d8 *./data/a-wmv1.avi +252d3435544372391ffb638e62957d34 *./data/out.yuv +stddev: 5.43 PSNR:33.41 bytes:7602176 +c4d6c235f25468fff5cdaec370e435d1 *./data/a-wmv2.avi +252d3435544372391ffb638e62957d34 *./data/out.yuv +stddev: 5.43 PSNR:33.41 bytes:7602176 +99a39e2f11d16cb88178f29d70f65eae *./data/a-h263.avi +dd1d762e16189ebc4e35edba973d409a *./data/out.yuv +stddev: 5.52 PSNR:33.27 bytes:7602176 +b018228ed1c0a283e735d1a7d84c9b2e *./data/a-h263p.avi +bdb990f96fa93ec84c69e45d5f7c539c *./data/out.yuv +stddev: 1.91 PSNR:42.46 bytes:7602176 +3ea1a7cfaa33dab4d1dee294777203d3 *./data/a-odivx.mp4 +c7d19f4c7905421ad8f21cde578342e0 *./data/out.yuv +stddev: 5.44 PSNR:33.40 bytes:7602176 242a7a18c2793e115007bc163861ef4e *./data/a-huffyuv.avi dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -6a469f42ce6946dd4c708f9e51e3da6a *./data/a-mpeg4-rc.avi -df9de7134d961119705b4e0cabca1f12 *./data/out.yuv -stddev: 4.20 PSNR:35.64 bytes:7145472 -3d37612990e20e335695849387df170a *./data/a-mpeg4-adv.avi -1654e08e6bfd63ee213d410edd5fb9c0 *./data/out.yuv -stddev: 4.77 PSNR:34.54 bytes:7602176 -2bf094c7d3167b9355c03b2a0908e6e2 *./data/a-mpeg4-thread.avi -f82c59b99500efb6f0d2af880a315ed1 *./data/out.yuv -stddev: 3.92 PSNR:36.25 bytes:7145472 -22776b9119bb2fa6b4c7de57b4ffb134 *./data/a-error-mpeg4-adv.avi -66591e021f200f065ec95e9b0f3c5169 *./data/out.yuv -stddev: 6.54 PSNR:31.80 bytes:7602176 -f68ca13a9b8216aa333968151bcb6ca0 *./data/a-mpeg4-nr.avi -a014c55328263220911cacc012e6e814 *./data/out.yuv -stddev: 4.67 PSNR:34.73 bytes:7602176 -26245e57b2dd6e2d9a0ef6d57fe6488d *./data/a-mpeg1b.mpg -d3d5876cef34b728602d5a22eee9249f *./data/out.yuv -stddev: 5.93 PSNR:32.66 bytes:7145472 +ca8f249763ca162cbee43cb32b7b165b *./data/a-mpeg4-rc.avi +05a188bd2479dd9384270c65beb02aa5 *./data/out.yuv +stddev: 4.33 PSNR:35.38 bytes:7145472 +8249cc83e341cd18e45adf589e1d254e *./data/a-mpeg4-adv.avi +a46b891f446aef2c025dc2847dc86ed6 *./data/out.yuv +stddev: 4.95 PSNR:34.22 bytes:7602176 +f2f6e3841d4a5def6d70297b09a6df6c *./data/a-mpeg4-thread.avi +bc4a00140a3d3f1b1c4a892e9f7eaec6 *./data/out.yuv +stddev: 4.11 PSNR:35.82 bytes:7145472 +901ebdbc7438744f0832a9a0cc7678e3 *./data/a-error-mpeg4-adv.avi +2143df4a665ead5fd402189326ce727d *./data/out.yuv +stddev: 4.41 PSNR:35.23 bytes:7602176 +575cbd5319516c4741edeaf146d6481e *./data/a-mpeg4-nr.avi +c4c821da817173c6d225ae0432daa0a0 *./data/out.yuv +stddev: 4.83 PSNR:34.43 bytes:7602176 +73bd6a2ef03f9b252b84062327424593 *./data/a-mpeg1b.mpg +344788ad84775c9af184e0d0b4bad3ed *./data/out.yuv +stddev: 5.98 PSNR:32.58 bytes:7145472 e9218a1db885fe0262e88f9df630307d *./data/a-mjpeg.avi a365b4da246ad68caf96b702b7f961a1 *./data/out.yuv stddev: 4.76 PSNR:34.56 bytes:7602176 defd90b44bced2772c6ca0d8eb75f668 *./data/a-ljpeg.avi dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -1b46671251277c14f3a24a034648c458 *./data/a-rv10.rm -e1923bc2940a017858e354c3fb0e6244 *./data/out.yuv -stddev: 13.18 PSNR:25.72 bytes:7602176 +53a73b773cf790c9379c875ffa73bce5 *./data/a-rv10.rm +fea195d6d9b57893dc68d1b36229a299 *./data/out.yuv +stddev: 13.52 PSNR:25.50 bytes:7602176 9c4f5a4613a5595c90c6b99bf143b6a9 *./data/a-asv1.avi 4251d7f496bbf362251b065e840a1b73 *./data/out.yuv stddev: 9.80 PSNR:28.29 bytes:7602176 19652f2aac2d4d0379d37ce17e0bbea7 *./data/a-asv2.avi 7d887519f7884e7c49c591831c11ac50 *./data/out.yuv stddev: 9.71 PSNR:28.37 bytes:7602176 -bee27a404ab6a1b7ab1d3551eb4f1877 *./data/a-flv.flv -86da6ee46d2df190b4a0d72523b14a25 *./data/out.yuv -stddev: 5.29 PSNR:33.64 bytes:7602176 +7e38c789c9913bcf863d4db724091b70 *./data/a-flv.flv +4ecc1c26b20de789e8ef59c649c2534e *./data/out.yuv +stddev: 5.44 PSNR:33.41 bytes:7602176 0db09835ebc3d22f166f30879f3ccc38 *./data/a-ffv1.avi dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176