[FFmpeg-cvslog] r23426 - trunk/libavcodec/vorbis_enc.c

[cehoyos]

Author: cehoyos
Date: Wed Jun  2 18:09:19 2010
New Revision: 23426

Log:
Avoid division by zero that caused noise, typically at the beginning or
end of a file.

Patch by Frank Barchard, fbarchard google

Modified:
   trunk/libavcodec/vorbis_enc.c

Modified: trunk/libavcodec/vorbis_enc.c
==============================================================================
--- trunk/libavcodec/vorbis_enc.c	Wed Jun  2 17:22:21 2010	(r23425)
+++ trunk/libavcodec/vorbis_enc.c	Wed Jun  2 18:09:19 2010	(r23426)
@@ -681,7 +681,7 @@ static void floor_fit(vorbis_enc_context
         float average = averages[i];
         int j;
 
-        average *= pow(tot_average / average, 0.5) * pow(1.25, position/200.); // MAGIC!
+        average = sqrt(tot_average * average) * pow(1.25f, position*0.005f); // MAGIC!
         for (j = 0; j < range - 1; j++)
             if (ff_vorbis_floor1_inverse_db_table[j * fc->multiplier] > average)
                 break;