summaryrefslogtreecommitdiff
path: root/libavutil/log.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-07-20 11:55:08 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-07-20 11:55:08 +0000
commit918a45917c4cab7f830c05d728f257a7c0ce2f34 (patch)
treedb99fdd179f57b84744afd414521ca1cf9be466e /libavutil/log.h
parentccb159940b2c6daaf0c9bf8f0fb8c87317754e1c (diff)
downloadffmpeg-918a45917c4cab7f830c05d728f257a7c0ce2f34.tar.gz
removing redundant mess next time we break compatiility
Originally committed as revision 5804 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/log.h')
-rw-r--r--libavutil/log.h5
1 files changed, 5 insertions, 0 deletions
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 */