diff options
author | wm4 <wm4@nowhere> | 2013-12-21 21:49:13 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-21 22:13:04 +0100 |
commit | eef36f03ea76f97c10075ae4b08e1e53e5195479 (patch) | |
tree | 9bafeac9944e717a2defe9e6f8fc753d3cdb9964 /video/filter/vf.c | |
parent | eba5d025d2ba682de358b792dd15e80529d6a0f1 (diff) | |
download | mpv-eef36f03ea76f97c10075ae4b08e1e53e5195479.tar.bz2 mpv-eef36f03ea76f97c10075ae4b08e1e53e5195479.tar.xz |
msg: rename mp_msg_log -> mp_msg
Same for companion functions.
Diffstat (limited to 'video/filter/vf.c')
-rw-r--r-- | video/filter/vf.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/video/filter/vf.c b/video/filter/vf.c index 13d1026b74..4600e9e375 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -198,26 +198,26 @@ static int vf_default_query_format(struct vf_instance *vf, unsigned int fmt) static void print_fmt(struct mp_log *log, int msglevel, struct mp_image_params *p) { if (p && p->imgfmt) { - mp_msg_log(log, msglevel, "%dx%d", p->w, p->h); + mp_msg(log, msglevel, "%dx%d", p->w, p->h); if (p->w != p->d_w || p->h != p->d_h) - mp_msg_log(log, msglevel, "->%dx%d", p->d_w, p->d_h); - mp_msg_log(log, msglevel, " %s", mp_imgfmt_to_name(p->imgfmt)); - mp_msg_log(log, msglevel, " %s/%s", mp_csp_names[p->colorspace], + mp_msg(log, msglevel, "->%dx%d", p->d_w, p->d_h); + mp_msg(log, msglevel, " %s", mp_imgfmt_to_name(p->imgfmt)); + mp_msg(log, msglevel, " %s/%s", mp_csp_names[p->colorspace], mp_csp_levels_names[p->colorlevels]); } else { - mp_msg_log(log, msglevel, "???"); + mp_msg(log, msglevel, "???"); } } void vf_print_filter_chain(struct vf_chain *c, int msglevel) { - if (!mp_msg_test_log(c->log, msglevel)) + if (!mp_msg_test(c->log, msglevel)) return; for (vf_instance_t *f = c->first; f; f = f->next) { - mp_msg_log(c->log, msglevel, " [%s] ", f->info->name); + mp_msg(c->log, msglevel, " [%s] ", f->info->name); print_fmt(c->log, msglevel, &f->fmt_out); - mp_msg_log(c->log, msglevel, "\n"); + mp_msg(c->log, msglevel, "\n"); } } @@ -507,7 +507,7 @@ int vf_reconfig(struct vf_chain *c, const struct mp_image_params *params) int loglevel = r < 0 ? MSGL_WARN : MSGL_V; if (r == -2) MP_ERR(c, "Image formats incompatible.\n"); - mp_msg_log(c->log, loglevel, "Video filter chain:\n"); + mp_msg(c->log, loglevel, "Video filter chain:\n"); vf_print_filter_chain(c, loglevel); return r; } |