diff log.c @ 88:b39b6310973c libavutil

removing redundant mess next time we break compatiility
author michael
date Thu, 20 Jul 2006 11:55:08 +0000
parents 5cfa773a3bdd
children d76a36742464
line wrap: on
line diff
--- a/log.c	Thu Jul 20 10:14:06 2006 +0000
+++ b/log.c	Thu Jul 20 11:55:08 2006 +0000
@@ -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 @@
     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 @@
     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 @@
 {
     av_log_callback = callback;
 }
+#endif