Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / random_seed.c

diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c
index 6dc8d22ca4fc608f5ce6ec8b1af59ab560e03115..81805e5db0db09abfbbe4352ec8ef8cc96b773df 100644 (file)
--- a/libavutil/random_seed.c
+++ b/libavutil/random_seed.c
@@ -1,29 +1,29 @@
 /*
  * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <unistd.h>
 #include <fcntl.h>
+#include <math.h>
+#include <time.h>
 #include "timer.h"
-#include "time.h"
 #include "random_seed.h"
-#include "avutil.h"
 
 static int read_random(uint32_t *dst, const char *file)
 {
@@ -80,11 +80,3 @@ uint32_t av_get_random_seed(void)
         return seed;
     return get_generic_seed();
 }
-
-#if LIBAVUTIL_VERSION_MAJOR < 51
-attribute_deprecated uint32_t ff_random_get_seed(void);
-uint32_t ff_random_get_seed(void)
-{
-    return av_get_random_seed();
-}
-#endif