From 576fb48e6dc8c75ece42fa7ede40f19de708b3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sun, 23 May 2010 08:53:40 +0000
Subject: [PATCH] Make ff_random_get_seed public, rename to av_get_random_seed,
 export the header

Keep an old ff_ named function for binary compatibility until the
next major bump.

Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 ffserver.c               |  2 +-
 libavfilter/parseutils.c |  2 +-
 libavformat/httpauth.c   |  2 +-
 libavformat/mxfenc.c     |  2 +-
 libavformat/rtpenc.c     |  4 ++--
 libavutil/Makefile       |  1 +
 libavutil/random_seed.c  | 11 ++++++++++-
 libavutil/random_seed.h  |  2 +-
 8 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 3cdcd8847c..7ec6eb4609 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4612,7 +4612,7 @@ int main(int argc, char **argv)
 
     unsetenv("http_proxy");             /* Kill the http_proxy */
 
-    av_lfg_init(&random_state, ff_random_get_seed());
+    av_lfg_init(&random_state, av_get_random_seed());
 
     memset(&sigact, 0, sizeof(sigact));
     sigact.sa_handler = handle_child_exit;
diff --git a/libavfilter/parseutils.c b/libavfilter/parseutils.c
index 9a7eef08cd..9ac61d8073 100644
--- a/libavfilter/parseutils.c
+++ b/libavfilter/parseutils.c
@@ -218,7 +218,7 @@ static int color_table_compare(const void *lhs, const void *rhs)
 int av_parse_color(uint8_t *rgba_color, const char *color_string, void *log_ctx)
 {
     if (!strcasecmp(color_string, "random") || !strcasecmp(color_string, "bikeshed")) {
-        int rgba = ff_random_get_seed();
+        int rgba = av_get_random_seed();
         rgba_color[0] = rgba >> 24;
         rgba_color[1] = rgba >> 16;
         rgba_color[2] = rgba >> 8;
diff --git a/libavformat/httpauth.c b/libavformat/httpauth.c
index cef27569a8..abdee81dec 100644
--- a/libavformat/httpauth.c
+++ b/libavformat/httpauth.c
@@ -200,7 +200,7 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username,
 
     /* Generate a client nonce. */
     for (i = 0; i < 2; i++)
-        cnonce_buf[i] = ff_random_get_seed();
+        cnonce_buf[i] = av_get_random_seed();
     ff_data_to_hex(cnonce, (const uint8_t*) cnonce_buf, sizeof(cnonce_buf), 1);
     cnonce[2*sizeof(cnonce_buf)] = 0;
 
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index ab381189c9..6ca7ee8c08 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1389,7 +1389,7 @@ static uint64_t mxf_parse_timestamp(time_t timestamp)
 static void mxf_gen_umid(AVFormatContext *s)
 {
     MXFContext *mxf = s->priv_data;
-    uint32_t seed = ff_random_get_seed();
+    uint32_t seed = av_get_random_seed();
     uint64_t umid = seed + 0x5294713400000000LL;
 
     AV_WB64(mxf->umid  , umid);
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 5df101eb04..3111c2b32e 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -80,10 +80,10 @@ static int rtp_write_header(AVFormatContext *s1)
     if (s->payload_type < 0)
         s->payload_type = RTP_PT_PRIVATE + (st->codec->codec_type == AVMEDIA_TYPE_AUDIO);
 
-    s->base_timestamp = ff_random_get_seed();
+    s->base_timestamp = av_get_random_seed();
     s->timestamp = s->base_timestamp;
     s->cur_timestamp = 0;
-    s->ssrc = ff_random_get_seed();
+    s->ssrc = av_get_random_seed();
     s->first_packet = 1;
     s->first_rtcp_ntp_time = ff_ntp_time();
     if (s1->start_time_realtime)
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 79506c05ea..6035ba6b44 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -19,6 +19,7 @@ HEADERS = adler32.h                                                     \
           mem.h                                                         \
           pixdesc.h                                                     \
           pixfmt.h                                                      \
+          random_seed.h                                                 \
           rational.h                                                    \
           sha1.h                                                        \
 
diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c
index 236cadd21b..00d6317241 100644
--- a/libavutil/random_seed.c
+++ b/libavutil/random_seed.c
@@ -22,8 +22,9 @@
 #include <fcntl.h>
 #include "timer.h"
 #include "random_seed.h"
+#include "avutil.h"
 
-uint32_t ff_random_get_seed(void)
+uint32_t av_get_random_seed(void)
 {
     uint32_t seed;
     int fd;
@@ -42,3 +43,11 @@ uint32_t ff_random_get_seed(void)
     // XXX what to do ?
     return 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
diff --git a/libavutil/random_seed.h b/libavutil/random_seed.h
index a954381025..11a9017644 100644
--- a/libavutil/random_seed.h
+++ b/libavutil/random_seed.h
@@ -26,6 +26,6 @@
 /**
  * Gets a seed to use in conjunction with random functions.
  */
-uint32_t ff_random_get_seed(void);
+uint32_t av_get_random_seed(void);
 
 #endif /* AVUTIL_RANDOM_SEED_H */