From 6661b2130d6c4e6fef9249d3414188f4384b0fc1 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 23 Feb 2006 13:05:37 +0000
Subject: [PATCH] dont lowwer qnos of more blocks then needed

Originally committed as revision 5055 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/dv.c               | 5 +++--
 tests/ffmpeg.regression.ref   | 6 +++---
 tests/libav.regression.ref    | 4 ++--
 tests/rotozoom.regression.ref | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 4d79b2cc53..19be0d4ab9 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -731,6 +731,7 @@ static inline void dv_guess_qnos(EncBlockInfo* blks, int* qnos)
     int i, j, k, a, prev, a2;
     EncBlockInfo* b;
 
+    size[4]= 1<<24;
     do {
        b = blks;
        for (i=0; i<5; i++) {
@@ -766,9 +767,9 @@ static inline void dv_guess_qnos(EncBlockInfo* blks, int* qnos)
                 size[i] += b->bit_size[a];
              }
           }
+          if(vs_total_ac_bits >= size[0] + size[1] + size[2] + size[3] + size[4])
+                return;
        }
-       if(vs_total_ac_bits >= size[0] + size[1] + size[2] + size[3] + size[4])
-            return;
     } while (qnos[0]|qnos[1]|qnos[2]|qnos[3]|qnos[4]);
 
 
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index d72d934a81..e2479321bf 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -133,10 +133,10 @@ stddev: 23.20 PSNR:20.81 bytes:7602176
 3533710 ./data/a-snow53.avi
 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-4e6e84ebab4eef5a9d7171cfd687d4cd *./data/a-dv.dv
+229e5f8d1f386d0cf84f629be7d74955 *./data/a-dv.dv
 7200000 ./data/a-dv.dv
-70c5b0eb61f16b7cd7328b4aca57a4e2 *./data/out.yuv
-stddev:  9.16 PSNR:28.88 bytes:7602176
+0ac51c62d3c2a4bacf216ea73050485e *./data/out.yuv
+stddev:  9.10 PSNR:28.94 bytes:7602176
 bd0db310a36ad94bcd4448abe0a88368 *./data/a-svq1.mov
 1379827 ./data/a-svq1.mov
 bbff871d1475e1eee4231a08e075de2c *./data/out.yuv
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 36d366975f..d64f523d59 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -28,9 +28,9 @@ e4ed8d635d867e2f5980fd9c73c9cf3d *./data/b-libav.mov
 8bf16d40a2ec19fa36b124a928e47e23 *./data/b-libav.nut
  332358 ./data/b-libav.nut
 ./data/b-libav.nut CRC=0xccab3a27
-9317bd7830cbc8d660cb7b8f5b949ac2 *./data/b-libav.dv
+973886f2acd79e6785e0f31519d721cf *./data/b-libav.dv
 3600000 ./data/b-libav.dv
-./data/b-libav.dv CRC=0xedf45b11
+./data/b-libav.dv CRC=0x5e1f4cdc
 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm
  317075 ./data/b-libav.pbm
 ./data/b-libav.pbm CRC=0xb92906cb
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index b402424777..1a482cab61 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -133,10 +133,10 @@ stddev: 10.94 PSNR:27.34 bytes:7602176
 2725570 ./data/a-snow53.avi
 dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-b829649260346655ad2c820ab56edeb3 *./data/a-dv.dv
+41165e82124bf9984f784bc007f6a0ac *./data/a-dv.dv
 7200000 ./data/a-dv.dv
-ecf8fde289dd44819493844e95057a6a *./data/out.yuv
-stddev:  3.16 PSNR:38.12 bytes:7602176
+b252172f3768271ab0e87a1a2bfc553d *./data/out.yuv
+stddev:  3.16 PSNR:38.13 bytes:7602176
 5b02b6ae7ffa257a66ae9857a992fdfe *./data/a-svq1.mov
 769527 ./data/a-svq1.mov
 44777d1ddbccd0ef7f8d08394465670c *./data/out.yuv