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

Originally committed as revision 16683 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Stefano Sabatini 16 years ago
parent 9c868219e9
commit 796dff07de
  1. 2
      libavutil/random.c
  2. 3
      libavutil/random.h

@ -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 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) void av_init_random(unsigned int seed, AVRandomState *state)
{ {
av_random_init(state, seed); 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) */ /** 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) void av_random_generate_untempered_numbers(AVRandomState *state)

@ -26,6 +26,7 @@
#define AV_RANDOM_N 624 #define AV_RANDOM_N 624
#include "avutil.h"
#include "common.h" #include "common.h"
typedef struct { typedef struct {
@ -34,7 +35,9 @@ typedef struct {
} AVRandomState; } AVRandomState;
#if LIBAVUTIL_VERSION_MAJOR < 50
attribute_deprecated void av_init_random(unsigned int seed, AVRandomState *state); 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_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). void av_random_generate_untempered_numbers(AVRandomState *state); ///< Regenerate the untempered numbers (must be done every 624 iterations, or it will loop).

Loading…
Cancel
Save