diff options
author | Luca Abeni <lucabe72@email.it> | 2006-07-18 11:00:55 +0000 |
---|---|---|
committer | Luca Abeni <lucabe72@email.it> | 2006-07-18 11:00:55 +0000 |
commit | 4b45de0e87fd67bab5f4261006130223304ee7a6 (patch) | |
tree | 136011c0a39a0ee673865780ecef370ac3ee13f6 /libavcodec/utils.c | |
parent | 8b75e45d8c1a84b39f19877c9248a20f23a78d98 (diff) | |
download | ffmpeg-4b45de0e87fd67bab5f4261006130223304ee7a6.tar.gz |
Move av_log() & friends to libavutil
Originally committed as revision 5781 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 1b05761a5e..0f8a4f4124 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1,7 +1,6 @@ /* * utils for libavcodec * Copyright (c) 2001 Fabrice Bellard. - * Copyright (c) 2003 Michel Bardiaux for the av_log API * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * * This library is free software; you can redistribute it and/or @@ -1339,57 +1338,6 @@ int av_get_bits_per_sample(enum CodecID codec_id){ } } -/* av_log API */ - -static int av_log_level = AV_LOG_INFO; - -static void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) -{ - static int print_prefix=1; - AVClass* avc= ptr ? *(AVClass**)ptr : NULL; - if(level>av_log_level) - return; -#undef fprintf - if(print_prefix && avc) { - fprintf(stderr, "[%s @ %p]", avc->item_name(ptr), avc); - } -#define fprintf please_use_av_log - - print_prefix= strstr(fmt, "\n") != NULL; - - vfprintf(stderr, fmt, vl); -} - -static void (*av_log_callback)(void*, int, const char*, va_list) = av_log_default_callback; - -void av_log(void* avcl, int level, const char *fmt, ...) -{ - va_list vl; - va_start(vl, fmt); - av_vlog(avcl, level, fmt, vl); - va_end(vl); -} - -void av_vlog(void* avcl, int level, const char *fmt, va_list vl) -{ - av_log_callback(avcl, level, fmt, vl); -} - -int av_log_get_level(void) -{ - return av_log_level; -} - -void av_log_set_level(int level) -{ - av_log_level = level; -} - -void av_log_set_callback(void (*callback)(void*, int, const char*, va_list)) -{ - av_log_callback = callback; -} - #if !defined(HAVE_THREADS) int avcodec_thread_init(AVCodecContext *s, int thread_count){ return -1; |