From 3bea538625a7cca8e1bc8b16ed8604b103319a0e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 6 Jan 2003 23:17:46 +0000 Subject: [PATCH] 1000l, but for whom? (zero ME sucks and caused the many I frames in the regression tests) Originally committed as revision 1405 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 2 +- tests/ffmpeg.regression.ref | 40 ++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index eae34d6e6c..5f19a545cb 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -110,7 +110,7 @@ static float video_b_qfactor = 1.25; static float video_b_qoffset = 1.25; static float video_i_qfactor = -0.8; static float video_i_qoffset = 0.0; -static int me_method = 0; +static int me_method = ME_EPZS; static int video_disable = 0; static int video_codec_id = CODEC_ID_NONE; static int same_quality = 0; diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index 56d1bc489d..8feb4e5d24 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -1,26 +1,26 @@ ffmpeg regression test -ad6a32c95384b9e92ac0e0c0701b40ec *./data/a-mpeg1.mpg -4df461aae1771d5472cb3dbacdd8078f *./data/out.yuv -7784ab8ea1c57242ab2fd23c83666b10 *./data/a-msmpeg4v2.avi -f3bc40b0a09eb06504fa5b51eb9135ee *./data/out.yuv -4c4323c1e3fd5c76944b4e48bd6c678c *./data/a-msmpeg4.avi -3ede54eadc97f43b4ab260faeb5e8674 *./data/out.yuv -2f6d0138eca59f1e60d7d63b31735e37 *./data/a-wmv1.avi -19b9075fb4fc264247e1f0237a00d43f *./data/out.yuv -a6527e93fe0e2e5942934efbde59f78b *./data/a-h263.avi -f3bc40b0a09eb06504fa5b51eb9135ee *./data/out.yuv -a11e0b741fa3c7fc491fb58ab8f7ca8d *./data/a-h263p.avi -615e3db2bdc535ca5b17996b29cabf24 *./data/out.yuv -67a4922527e2341d11d6a61c79b497e5 *./data/a-odivx.avi -3ede54eadc97f43b4ab260faeb5e8674 *./data/out.yuv -4fdf373ede0785cc381687b8f1b207d4 *./data/a-mpeg4-rc.avi -d34057ff0806320c8be54fe34210c937 *./data/out.yuv -2abefdb7650d076021ad455cc5ef040e *./data/a-mpeg4-adv.avi -a26abb66bf9c5f5df3ab971dfdf1189d *./data/out.yuv +b6890e2acd58f8d63a1715c7a24bc532 *./data/a-mpeg1.mpg +fe31fdf76e2637008b7dd81410dc6116 *./data/out.yuv +ead9ee6b12600287e88b9c509a8d1a8d *./data/a-msmpeg4v2.avi +af5ea19f0cf824c3b662d606d5595bd1 *./data/out.yuv +e7bfbccda9e0524e1bf55af1bc329680 *./data/a-msmpeg4.avi +dc4775f94a791807ff2414b6229d1d28 *./data/out.yuv +1f698011b538b49bea75e57a1ca301ce *./data/a-wmv1.avi +b86859ddfeea067fa6490fa9005a9e7b *./data/out.yuv +40d6807306a7485f169354ce38e06e5e *./data/a-h263.avi +4c2bfad388cf8f68e11c6ff9181a016e *./data/out.yuv +0bcfca4de0aff3953a4ee6b80ef009bb *./data/a-h263p.avi +e2386d462ed9a23c81080d3e1b23b1f5 *./data/out.yuv +4867f7ee13eb0b25385d79fc487f9844 *./data/a-odivx.avi +b19932f3e21ad5c006ea086444178982 *./data/out.yuv +cb469fe3e3853a30cdd45d2ad04f2dc2 *./data/a-mpeg4-rc.avi +6fb43c4f1bdadfa071699f15a5b3b9be *./data/out.yuv +b5bcc3b4b3309915fc299ae0e2827a54 *./data/a-mpeg4-adv.avi +57802d3bf118e47678843ebbdebfec25 *./data/out.yuv 2846c8e3d97d7395eb746bfce44e0443 *./data/a-mjpeg.avi 278033451d7a6bfeb8339abbe4228499 *./data/out.yuv -b5f5efce96150d5cc8f5af8024ae3688 *./data/a-rv10.rm -f3bc40b0a09eb06504fa5b51eb9135ee *./data/out.yuv +fdf12f672ef127ae2cf35af48e72c2c9 *./data/a-rv10.rm +4c2bfad388cf8f68e11c6ff9181a016e *./data/out.yuv 21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2 116d1290ba1b4eb98fdee52e423417b1 *./data/out.wav 048b9c3444c788bac6ce5cc3a8f4db00 *./data/a-ac3.rm