Commit 082dea8e authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Remove all remaining code that was disabled through the major version bump.

Originally committed as revision 17903 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 08817483
......@@ -53,15 +53,6 @@ struct AVCLASS {
/* av_log API */
#if LIBAVUTIL_VERSION_INT < (50<<16)
#define AV_LOG_QUIET -1
#define AV_LOG_FATAL 0
#define AV_LOG_ERROR 0
#define AV_LOG_WARNING 1
#define AV_LOG_INFO 1
#define AV_LOG_VERBOSE 1
#define AV_LOG_DEBUG 2
#else
#define AV_LOG_QUIET -8
/**
......@@ -95,11 +86,6 @@ struct AVCLASS {
* Stuff which is only useful for libav* developers.
*/
#define AV_LOG_DEBUG 48
#endif
#if LIBAVUTIL_VERSION_INT < (50<<16)
extern int av_log_level;
#endif
/**
* Sends the specified message to the log if the level is less than or equal
......
......@@ -55,12 +55,6 @@ int64_t av_gcd(int64_t a, int64_t b){
else return a;
}
#if LIBAVUTIL_VERSION_MAJOR < 50
int64_t ff_gcd(int64_t a, int64_t b){
return av_gcd(a, b);
}
#endif
int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd){
int64_t r=0;
assert(c > 0);
......
......@@ -56,13 +56,6 @@ void av_random_init(AVRandomState *state, unsigned int seed)
state->index= index; // Will cause it to generate untempered numbers in the first iteration.
}
#if LIBAVUTIL_VERSION_MAJOR < 50
void av_init_random(unsigned int seed, AVRandomState *state)
{
av_random_init(state, seed);
}
#endif
/** Generates 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)
......
......@@ -35,9 +35,6 @@ typedef struct {
} AVRandomState;
#if LIBAVUTIL_VERSION_MAJOR < 50
attribute_deprecated void av_init_random(unsigned int seed, AVRandomState *state);
#endif
attribute_deprecated 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.
attribute_deprecated void av_random_generate_untempered_numbers(AVRandomState *state); ///< Regenerate the untempered numbers (must be done every 624 iterations, or it will loop).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment