Originally committed as revision 17903 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -53,15 +53,6 @@ struct AVCLASS {
|
| 53 | 53 |
|
| 54 | 54 |
/* av_log API */ |
| 55 | 55 |
|
| 56 |
-#if LIBAVUTIL_VERSION_INT < (50<<16) |
|
| 57 |
-#define AV_LOG_QUIET -1 |
|
| 58 |
-#define AV_LOG_FATAL 0 |
|
| 59 |
-#define AV_LOG_ERROR 0 |
|
| 60 |
-#define AV_LOG_WARNING 1 |
|
| 61 |
-#define AV_LOG_INFO 1 |
|
| 62 |
-#define AV_LOG_VERBOSE 1 |
|
| 63 |
-#define AV_LOG_DEBUG 2 |
|
| 64 |
-#else |
|
| 65 | 56 |
#define AV_LOG_QUIET -8 |
| 66 | 57 |
|
| 67 | 58 |
/** |
| ... | ... |
@@ -95,11 +86,6 @@ struct AVCLASS {
|
| 95 | 95 |
* Stuff which is only useful for libav* developers. |
| 96 | 96 |
*/ |
| 97 | 97 |
#define AV_LOG_DEBUG 48 |
| 98 |
-#endif |
|
| 99 |
- |
|
| 100 |
-#if LIBAVUTIL_VERSION_INT < (50<<16) |
|
| 101 |
-extern int av_log_level; |
|
| 102 |
-#endif |
|
| 103 | 98 |
|
| 104 | 99 |
/** |
| 105 | 100 |
* 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){
|
| 55 | 55 |
else return a; |
| 56 | 56 |
} |
| 57 | 57 |
|
| 58 |
-#if LIBAVUTIL_VERSION_MAJOR < 50 |
|
| 59 |
-int64_t ff_gcd(int64_t a, int64_t b){
|
|
| 60 |
- return av_gcd(a, b); |
|
| 61 |
-} |
|
| 62 |
-#endif |
|
| 63 |
- |
|
| 64 | 58 |
int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd){
|
| 65 | 59 |
int64_t r=0; |
| 66 | 60 |
assert(c > 0); |
| ... | ... |
@@ -56,13 +56,6 @@ void av_random_init(AVRandomState *state, unsigned int seed) |
| 56 | 56 |
state->index= index; // Will cause it to generate untempered numbers in the first iteration. |
| 57 | 57 |
} |
| 58 | 58 |
|
| 59 |
-#if LIBAVUTIL_VERSION_MAJOR < 50 |
|
| 60 |
-void av_init_random(unsigned int seed, AVRandomState *state) |
|
| 61 |
-{
|
|
| 62 |
- av_random_init(state, seed); |
|
| 63 |
-} |
|
| 64 |
-#endif |
|
| 65 |
- |
|
| 66 | 59 |
/** Generates AV_RANDOM_N words at one time (which will then be tempered later). |
| 67 | 60 |
* av_random calls this; you shouldn't. */ |
| 68 | 61 |
void av_random_generate_untempered_numbers(AVRandomState *state) |
| ... | ... |
@@ -35,9 +35,6 @@ typedef struct {
|
| 35 | 35 |
} AVRandomState; |
| 36 | 36 |
|
| 37 | 37 |
|
| 38 |
-#if LIBAVUTIL_VERSION_MAJOR < 50 |
|
| 39 |
-attribute_deprecated void av_init_random(unsigned int seed, AVRandomState *state); |
|
| 40 |
-#endif |
|
| 41 | 38 |
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. |
| 42 | 39 |
attribute_deprecated void av_random_generate_untempered_numbers(AVRandomState *state); ///< Regenerate the untempered numbers (must be done every 624 iterations, or it will loop). |
| 43 | 40 |
|