Simple arithmetic error as part of fix to #1658 caused floor1 fitting to

fall apart in overwhelmingly tonal regions.

svn path=/trunk/vorbis/; revision=17052

diff --git a/lib/floor1.c b/lib/floor1.c
index cbd6c4a..7c74e37 100644 (file)
--- a/lib/floor1.c
+++ b/lib/floor1.c
@@ -511,7 +511,7 @@ static int fit_line(lsfit_acc *a,int fits,int *y0,int *y1,
     bn++;
   }
 
-  weight = bn*info->twofitweight/(an+1);
+  weight = (bn*an)*info->twofitweight/(an+1)+1.;
   xb += xa * weight;
   yb += ya * weight;
   x2b += x2a * weight;