summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-26 12:08:40 +0000
committerhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-26 12:08:40 +0000
commite56c8ee2d0aee15ca735878f6324f2c653e79687 (patch)
tree90ee783fd520de941d31e03a2e534cfe4a0f844d /libmpcodecs
parent30155960a4d4799743e59e89724dcc6550ff5229 (diff)
downloadmpv-e56c8ee2d0aee15ca735878f6324f2c653e79687.tar.bz2
mpv-e56c8ee2d0aee15ca735878f6324f2c653e79687.tar.xz
Check the log level before processing the message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21258 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vd_ffmpeg.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 64154aaff7..32e3bb9873 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -175,6 +175,15 @@ void mp_msp_av_log_callback(void* ptr, int level, const char* fmt, va_list vl)
int mp_level;
char buf[256];
+ switch(level){
+ case AV_LOG_DEBUG: mp_level= MSGL_V ; break;
+ case AV_LOG_INFO : mp_level= MSGL_INFO; break;
+ case AV_LOG_ERROR: mp_level= MSGL_ERR ; break;
+ default : mp_level= MSGL_ERR ; break;
+ }
+
+ if (!mp_msg_test(type, mp_level)) return;
+
if(ptr){
if(!strcmp(avc->class_name, "AVCodecContext")){
AVCodecContext * s= ptr;
@@ -199,13 +208,6 @@ void mp_msp_av_log_callback(void* ptr, int level, const char* fmt, va_list vl)
}
}
- switch(level){
- case AV_LOG_DEBUG: mp_level= MSGL_V ; break;
- case AV_LOG_INFO : mp_level= MSGL_INFO; break;
- case AV_LOG_ERROR: mp_level= MSGL_ERR ; break;
- default : mp_level= MSGL_ERR ; break;
- }
-
if(print_prefix && avc) {
mp_msg(type, mp_level, "[%s @ %p]", avc->item_name(ptr), avc);
}