Mercurial > libavformat.hg

changeset 5952:7f9a0da9f56a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Plug librtmp logging into av_log. patch by Howard Chu, hyc highlandsun com
author diego
date Tue, 13 Apr 2010 22:11:21 +0000
parents 28103c669f01
children c3ebc8d7af38
files librtmp.c
diffstat 1 files changed, 17 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/librtmp.c	Tue Apr 13 22:08:36 2010 +0000
+++ b/librtmp.c	Tue Apr 13 22:11:21 2010 +0000
@@ -29,6 +29,22 @@
 #include <librtmp/rtmp.h>
 #include <librtmp/log.h>
 
+static void rtmp_log(int level, const char *fmt, va_list args)
+{
+    switch (level) {
+    default:
+    case RTMP_LOGCRIT:    level = AV_LOG_FATAL;   break;
+    case RTMP_LOGERROR:   level = AV_LOG_ERROR;   break;
+    case RTMP_LOGWARNING: level = AV_LOG_WARNING; break;
+    case RTMP_LOGINFO:    level = AV_LOG_INFO;    break;
+    case RTMP_LOGDEBUG:   level = AV_LOG_VERBOSE; break;
+    case RTMP_LOGDEBUG2:  level = AV_LOG_DEBUG;   break;
+    }
+
+    av_vlog(NULL, level, fmt, args);
+    av_log(NULL, level, "\n");
+}
+
 static int rtmp_close(URLContext *s)
 {
     RTMP *r = s->priv_data;
@@ -69,6 +85,7 @@
     case AV_LOG_DEBUG:   rc = RTMP_LOGDEBUG2;  break;
     }
     RTMP_LogSetLevel(rc);
+    RTMP_LogSetCallback(rtmp_log);
 
     RTMP_Init(r);
     if (!RTMP_SetupURL(r, s->filename)) {