diff options
Diffstat (limited to 'contrib/ffmpeg/libavutil/log.h')
| -rw-r--r-- | contrib/ffmpeg/libavutil/log.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/contrib/ffmpeg/libavutil/log.h b/contrib/ffmpeg/libavutil/log.h index fa88f5fb2..5d18197ef 100644 --- a/contrib/ffmpeg/libavutil/log.h +++ b/contrib/ffmpeg/libavutil/log.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef LOG_H -#define LOG_H +#ifndef FFMPEG_LOG_H +#define FFMPEG_LOG_H #include <stdarg.h> @@ -81,7 +81,10 @@ struct AVCLASS { */ #define AV_LOG_DEBUG 48 #endif + +#if LIBAVUTIL_VERSION_INT < (50<<16) extern int av_log_level; +#endif /** * Send the specified message to the log if the level is less than or equal to @@ -103,14 +106,10 @@ 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)); extern void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl); -#else -extern void (*av_vlog)(void*, int, const char*, va_list); -#endif -#endif /* LOG_H */ +#endif /* FFMPEG_LOG_H */ |