diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-07-20 11:55:08 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-07-20 11:55:08 +0000 |
| commit | 918a45917c4cab7f830c05d728f257a7c0ce2f34 (patch) | |
| tree | db99fdd179f57b84744afd414521ca1cf9be466e | |
| parent | ccb159940b2c6daaf0c9bf8f0fb8c87317754e1c (diff) | |
| download | ffmpeg-918a45917c4cab7f830c05d728f257a7c0ce2f34.tar.gz | |
removing redundant mess next time we break compatiility
Originally committed as revision 5804 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/log.c | 8 | ||||
| -rw-r--r-- | libavutil/log.h | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index 7786ea211d..f43593ad92 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -24,7 +24,7 @@ #include "avutil.h" -static int av_log_level = AV_LOG_INFO; +int av_log_level = AV_LOG_INFO; static void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) { @@ -43,7 +43,11 @@ static void av_log_default_callback(void* ptr, int level, const char* fmt, va_li vfprintf(stderr, fmt, vl); } +#if LIBAVUTIL_VERSION_INT < (50<<16) static void (*av_log_callback)(void*, int, const char*, va_list) = av_log_default_callback; +#else +void (*av_vlog)(void*, int, const char*, va_list) = av_log_default_callback; +#endif void av_log(void* avcl, int level, const char *fmt, ...) { @@ -53,6 +57,7 @@ void av_log(void* avcl, int level, const char *fmt, ...) va_end(vl); } +#if LIBAVUTIL_VERSION_INT < (50<<16) void av_vlog(void* avcl, int level, const char *fmt, va_list vl) { av_log_callback(avcl, level, fmt, vl); @@ -72,3 +77,4 @@ void av_log_set_callback(void (*callback)(void*, int, const char*, va_list)) { av_log_callback = callback; } +#endif diff --git a/libavutil/log.h b/libavutil/log.h index 6c2dba009d..13366064e9 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -22,6 +22,7 @@ struct AVCLASS { #define AV_LOG_ERROR 0 #define AV_LOG_INFO 1 #define AV_LOG_DEBUG 2 +extern int av_log_level; #ifdef __GNUC__ extern void av_log(void*, int level, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4))); @@ -29,9 +30,13 @@ extern void av_log(void*, int level, const char *fmt, ...) __attribute__ ((__for extern void av_log(void*, int level, const char *fmt, ...); #endif +#if LIBAVUTIL_VERSION_INT < (50<<16) extern void av_vlog(void*, int level, const char *fmt, va_list); extern int av_log_get_level(void); extern void av_log_set_level(int); extern void av_log_set_callback(void (*)(void*, int, const char*, va_list)); +#else +extern void (*av_vlog)(void*, int, const char*, va_list); +#endif #endif /* LOG_H */ |