RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-23 07:42:51 +00:00
Code Issues Projects Releases Wiki Activity

removing redundant mess next time we break compatiility

Browse Source 
Originally committed as revision 5804 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-07-20 11:55:08 +00:00
parent ccb159940b
commit 918a45917c
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/log.c
View File

@ -24,7 +24,7 @@
#include "avutil.h" #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) 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); 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; 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, ...) 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); va_end(vl);
} }
#if LIBAVUTIL_VERSION_INT < (50<<16)
void av_vlog(void* avcl, int level, const char *fmt, va_list vl) void av_vlog(void* avcl, int level, const char *fmt, va_list vl)
{ {
av_log_callback(avcl, level, fmt, 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; av_log_callback = callback;
} }
#endif

5
libavutil/log.h
View File

@ -22,6 +22,7 @@ struct AVCLASS {
#define AV_LOG_ERROR 0 #define AV_LOG_ERROR 0
#define AV_LOG_INFO 1 #define AV_LOG_INFO 1
#define AV_LOG_DEBUG 2 #define AV_LOG_DEBUG 2
extern int av_log_level;
#ifdef __GNUC__ #ifdef __GNUC__
extern void av_log(void*, int level, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4))); 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, ...); extern void av_log(void*, int level, const char *fmt, ...);
#endif #endif
#if LIBAVUTIL_VERSION_INT < (50<<16)
extern void av_vlog(void*, int level, const char *fmt, va_list); extern void av_vlog(void*, int level, const char *fmt, va_list);
extern int av_log_get_level(void); extern int av_log_get_level(void);
extern void av_log_set_level(int); extern void av_log_set_level(int);
extern void av_log_set_callback(void (*)(void*, int, const char*, va_list)); 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 */ #endif /* LOG_H */