From fe896ec2f9c416da3313e605c67458ee3773d639 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Fri, 16 Sep 2011 19:54:03 +0200
Subject: [PATCH] ratecontrol: estimate twice the qscale values

This had been the fix used by Michael Niedermayer to solve the
ratecontrol convergence issue.
---
 libavcodec/ratecontrol.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index e984ed5b29..64dab153f6 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -862,8 +862,8 @@ static int init_pass2(MpegEncContext *s)
         /* find qscale */
         for(i=0; i<rcc->num_entries; i++){
             RateControlEntry *rce= &rcc->entry[i];
-            qscale[i]= get_qscale(s, &rcc->entry[i], rate_factor, i);
-            rcc->last_qscale_for[rce->pict_type] = qscale[i];
+            double q = get_qscale(s, &rcc->entry[i], rate_factor, i);
+            qscale[i] = get_diff_limited_q(s, rce, q);
         }
         assert(filter_size%2==1);