summaryrefslogtreecommitdiffstats
path: root/common/av_log.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 21:49:13 +0100
committerwm4 <wm4@nowhere>2013-12-21 22:13:04 +0100
commiteef36f03ea76f97c10075ae4b08e1e53e5195479 (patch)
tree9bafeac9944e717a2defe9e6f8fc753d3cdb9964 /common/av_log.c
parenteba5d025d2ba682de358b792dd15e80529d6a0f1 (diff)
downloadmpv-eef36f03ea76f97c10075ae4b08e1e53e5195479.tar.bz2
mpv-eef36f03ea76f97c10075ae4b08e1e53e5195479.tar.xz
msg: rename mp_msg_log -> mp_msg
Same for companion functions.
Diffstat (limited to 'common/av_log.c')
-rw-r--r--common/av_log.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/common/av_log.c b/common/av_log.c
index a6d51f88e3..1fcaf55fcc 100644
--- a/common/av_log.c
+++ b/common/av_log.c
@@ -134,12 +134,12 @@ static void mp_msg_av_log_callback(void *ptr, int level, const char *fmt,
struct mp_log *log = get_av_log(ptr);
- if (mp_msg_test_log(log, mp_level)) {
+ if (mp_msg_test(log, mp_level)) {
if (log_print_prefix)
- mp_msg_log(log, mp_level, "%s: ", avc ? avc->item_name(ptr) : "?");
+ mp_msg(log, mp_level, "%s: ", avc ? avc->item_name(ptr) : "?");
log_print_prefix = fmt[strlen(fmt) - 1] == '\n';
- mp_msg_log_va(log, mp_level, fmt, vl);
+ mp_msg_va(log, mp_level, fmt, vl);
}
pthread_mutex_unlock(&log_lock);
@@ -184,16 +184,16 @@ void uninit_libav(struct mpv_global *global)
static void print_version(struct mp_log *log, int v, char *name,
unsigned buildv, unsigned runv)
{
- mp_msg_log(log, v, " %-15s %d.%d.%d", name, V(buildv));
+ mp_msg(log, v, " %-15s %d.%d.%d", name, V(buildv));
if (buildv != runv)
- mp_msg_log(log, v, " (runtime %d.%d.%d)", V(runv));
- mp_msg_log(log, v, "\n");
+ mp_msg(log, v, " (runtime %d.%d.%d)", V(runv));
+ mp_msg(log, v, "\n");
}
#undef V
void print_libav_versions(struct mp_log *log, int v)
{
- mp_msg_log(log, v, "%s library versions:\n", LIB_PREFIX);
+ mp_msg(log, v, "%s library versions:\n", LIB_PREFIX);
print_version(log, v, "libavutil", LIBAVUTIL_VERSION_INT, avutil_version());
print_version(log, v, "libavcodec", LIBAVCODEC_VERSION_INT, avcodec_version());