[SCM] libav/experimental: Fix infinite loop with clock() returning (clock_t)-1.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:10:42 UTC 2013


The following commit has been merged in the experimental branch:
commit 6a522c49c2f6c33c047df5e5ebb448a03effa817
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Jul 8 18:13:31 2010 +0000

    Fix infinite loop with clock() returning (clock_t)-1.
    
    Originally committed as revision 24116 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c
index 762e02e..db1ba39 100644
--- a/libavutil/random_seed.c
+++ b/libavutil/random_seed.c
@@ -40,17 +40,17 @@ static int read_random(uint32_t *dst, const char *file)
 
 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);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list