From 082dea8e404ea30c7ece089cf7cd81c38c3916c4 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 9 Mar 2009 10:24:47 +0000
Subject: [PATCH] Remove all remaining code that was disabled through the major
version bump.
Originally committed as revision 17903 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavutil/log.h | 14 --------------
libavutil/mathematics.c | 6 ------
libavutil/random.c | 7 -------
libavutil/random.h | 3 ---
4 files changed, 30 deletions(-)
diff --git a/libavutil/log.h b/libavutil/log.h
index a886844d9b0..1206a2fc386 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -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
diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c
index ff488a70ef7..f57cf8e4b61 100644
--- a/libavutil/mathematics.c
+++ b/libavutil/mathematics.c
@@ -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);
diff --git a/libavutil/random.c b/libavutil/random.c
index 5597e1d1c09..94671556fcb 100644
--- a/libavutil/random.c
+++ b/libavutil/random.c
@@ -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)
diff --git a/libavutil/random.h b/libavutil/random.h
index 90378822b27..ed4c0ac84dc 100644
--- a/libavutil/random.h
+++ b/libavutil/random.h
@@ -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).
--
GitLab