Drop the deprecated av_init_random() at the next libavutil major bump.

Originally committed as revision 16683 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/random.c b/libavutil/random.c
index 9b5d112..2f9dd5d 100644 (file)
--- a/libavutil/random.c
+++ b/libavutil/random.c
@@ -55,10 +55,12 @@ void av_random_init(AVRandomState *state, unsigned int seed)
     state->index= index; // will cause it to generate untempered numbers the first iteration
 }
 
+#if LIBAVUTIL_VERSION_MAJOR < 50
 void av_init_random(unsigned int seed, AVRandomState *state)
 {
     av_random_init(state, seed);
 }
+#endif
 
 /** generate AV_RANDOM_N words at one time (which will then be tempered later) (av_random calls this; you shouldn't) */
 void av_random_generate_untempered_numbers(AVRandomState *state)

diff --git a/libavutil/random.h b/libavutil/random.h
index 0bedcd5..d9991c0 100644 (file)
--- a/libavutil/random.h
+++ b/libavutil/random.h
@@ -26,6 +26,7 @@
 
 #define AV_RANDOM_N 624
 
+#include "avutil.h"
 #include "common.h"
 
 typedef struct {
@@ -34,7 +35,9 @@ typedef struct {
 } AVRandomState;
 
 
+#if LIBAVUTIL_VERSION_MAJOR < 50
 attribute_deprecated void av_init_random(unsigned int seed, AVRandomState *state);
+#endif
 void av_random_init(AVRandomState *state, unsigned int seed); ///< To be inlined, the struct must be visible. So it does not make sense to try and keep it opaque with malloc/free-like calls.
 void av_random_generate_untempered_numbers(AVRandomState *state); ///< Regenerate the untempered numbers (must be done every 624 iterations, or it will loop).