Commit 918a4591 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

removing redundant mess next time we break compatiility

Originally committed as revision 5804 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ccb15994
......@@ -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
......@@ -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 */
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