[FFmpeg-cvslog] r24116 - trunk/libavutil/random_seed.c

[michael]

Author: michael
Date: Thu Jul  8 20:13:31 2010
New Revision: 24116

Log:
Fix infinite loop with clock() returning (clock_t)-1.

Modified:
   trunk/libavutil/random_seed.c

Modified: trunk/libavutil/random_seed.c
==============================================================================
--- trunk/libavutil/random_seed.c	Thu Jul  8 19:55:37 2010	(r24115)
+++ trunk/libavutil/random_seed.c	Thu Jul  8 20:13:31 2010	(r24116)
@@ -40,17 +40,17 @@ static int read_random(uint32_t *dst, co
 
 static uint32_t get_generic_seed(void)
 {
-    int last_t=0;
+    clock_t last_t=0;
     int bits=0;
     uint64_t random=0;
     unsigned i;
-    int s=0;
+    float s=0.000000000001;
 
     for(i=0;bits<64;i++){
-        int t= clock()>>s;
-        if(last_t && t != last_t){
-            if(i<10000 && s<24){
-                s++;
+        clock_t t= clock();
+        if(last_t && fabs(t-last_t)>s || t==(clock_t)-1){
+            if(i<10000 && s<(1<<24)){
+                s+=s;
                 i=t=0;
             }else{
                 random= 2*random + (i&1);