From b7c51ebc89e98e27bed2664da7037c665b2f7a92 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 24 Dec 2005 03:12:07 +0000
Subject: [PATCH] slightly better mv_penalty table

Originally committed as revision 4770 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/h263.c             |  2 +-
 tests/ffmpeg.regression.ref   | 18 +++++++++---------
 tests/rotozoom.regression.ref |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 3c0712d047..d3c72d132c 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -1763,7 +1763,7 @@ static void init_mv_penalty_and_fcode(MpegEncContext *s)
                 if(code<33){
                     len= mvtab[code][1] + 1 + bit_size;
                 }else{
-                    len= mvtab[32][1] + 2 + bit_size;
+                    len= mvtab[32][1] + av_log2(code>>5) + 2 + bit_size;
                 }
             }
 
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 44cdea2f63..8b8eb2ea22 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -51,25 +51,25 @@ fc01a5723a0d629bb73c74d64692120d *./data/a-h263p.avi
 2414342 ./data/a-h263p.avi
 28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv
 stddev:  2.07 PSNR:41.76 bytes:7602176
-9aceeacc860415019807c8f5f462dd1b *./data/a-odivx.mp4
-554440 ./data/a-odivx.mp4
-e400c9175dd1811cdeee7be5555d33f1 *./data/out.yuv
+80e21d45a75c2dfce42a2894be750b03 *./data/a-odivx.mp4
+554527 ./data/a-odivx.mp4
+57aed19df5cbada4b05991527ee72ebe *./data/out.yuv
 stddev:  7.99 PSNR:30.06 bytes:7602176
 8a9a98678a2e9c2e857f741cbb8e9ccb *./data/a-huffyuv.avi
 7932708 ./data/a-huffyuv.avi
 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-cd541209c9ef0c1824ac340d5087f0e0 *./data/a-mpeg4-rc.avi
-824336 ./data/a-mpeg4-rc.avi
-6656c0be50eba458b5ab91bfe6bf3077 *./data/out.yuv
+cc4a9bf5046d4f471174800135867831 *./data/a-mpeg4-rc.avi
+824318 ./data/a-mpeg4-rc.avi
+df7de6d3ce1faf92393985485cdf287a *./data/out.yuv
 stddev: 10.41 PSNR:27.77 bytes:7602176
 81078d7852dfd6041ff17b5dc8ed0ffc *./data/a-mpeg4-adv.avi
 600240 ./data/a-mpeg4-adv.avi
 0b7935cee2070f3b838478cea6dc4b3c *./data/out.yuv
 stddev: 10.25 PSNR:27.90 bytes:7602176
-5da70c628af00fc6d2dba685d24341b6 *./data/a-mpeg4-thread.avi
-764920 ./data/a-mpeg4-thread.avi
-6e3cc8569fd1f39a3657045a8249dbc6 *./data/out.yuv
+b0235e9bf3cf3867064b9ff21cda76de *./data/a-mpeg4-thread.avi
+764896 ./data/a-mpeg4-thread.avi
+d10f9ee6af493233f46a2ff2b178940a *./data/out.yuv
 stddev: 12.32 PSNR:26.30 bytes:7602176
 50867a2530035615152f1e068c989bfc *./data/a-mpeg4-Q.avi
 899514 ./data/a-mpeg4-Q.avi
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 8c99c9d181..8e62077bc0 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -71,9 +71,9 @@ stddev:  4.84 PSNR:34.41 bytes:7602176
 253448 ./data/a-mpeg4-thread.avi
 672eff5de3b19df7b82ed3e6bed8642d *./data/out.yuv
 stddev:  4.05 PSNR:35.96 bytes:7602176
-ddcb9476113fac71ee609018984353ce *./data/a-mpeg4-Q.avi
-165016 ./data/a-mpeg4-Q.avi
-94d8bd3897ac20bb3bef9cf384f9abd0 *./data/out.yuv
+1d39759d16065aeb96cc81aabd735f78 *./data/a-mpeg4-Q.avi
+165034 ./data/a-mpeg4-Q.avi
+b15dac581c3ba6e5e016df5dea360dc0 *./data/out.yuv
 stddev:  4.01 PSNR:36.05 bytes:7602176
 217c694a61eea2dd8896d558fed3fc05 *./data/a-error-mpeg4-adv.avi
 175778 ./data/a-error-mpeg4-adv.avi