From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 16 Nov 2012 15:55:48 +0000 (+0100)
Subject: ffv1enc: consider 2pass float rounding, fix loop
X-Git-Tag: android-x86-4.4-r1~8022
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c2cbc80ae9e3f00e21235915a80f81a2aeb7db0a;p=android-x86%2Fexternal-ffmpeg.git

ffv1enc: consider 2pass float rounding, fix loop

Found-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 41ace3f288..b3879fc83c 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -604,7 +604,7 @@ static int sort_stt(FFV1Context *s, uint8_t stt[256])
 
                 double size0 = COST2(i,  i) + COST2(i2, i2);
                 double sizeX = COST2(i, i2) + COST2(i2, i);
-                if (sizeX < size0 && i != 128 && i2 != 128) {
+                if (size0 - sizeX > size0*(1e-14) && i != 128 && i2 != 128) {
                     int j;
                     FFSWAP(int, stt[i], stt[i2]);
                     FFSWAP(int, s->rc_stat[i][0], s->rc_stat[i2][0]);