OSDN Git Service

ffv1enc: consider 2pass float rounding, fix loop
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Nov 2012 15:55:48 +0000 (16:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Nov 2012 16:01:13 +0000 (17:01 +0100)
Found-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ffv1enc.c

index 41ace3f..b3879fc 100644 (file)
@@ -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]);