From 7bdee8f35ed0aa19c83377b7c264c51696f9653f Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 21 Dec 2013 20:04:49 +0100
Subject: m_option: add mp_log context to sub-module print_help callback

---
 options/m_option.c      |  2 +-
 options/m_option.h      |  2 +-
 video/filter/vf.h       |  2 +-
 video/filter/vf_lavfi.c | 12 +++++-------
 video/filter/vf_pp.c    |  6 +++---
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/options/m_option.c b/options/m_option.c
index f3b7afcd18..5b9654c744 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -2142,7 +2142,7 @@ static int m_obj_parse_sub_config(struct mp_log *log, struct bstr opt_name,
 print_help: ;
     if (config) {
         if (desc->print_help)
-            desc->print_help();
+            desc->print_help(log);
         m_config_print_option_list(config);
     } else {
         mp_warn(log, "Option %.*s doesn't exist.\n",
diff --git a/options/m_option.h b/options/m_option.h
index 7caa103f2f..abc45b07aa 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -114,7 +114,7 @@ struct m_obj_desc {
     // Don't list entry with "help"
     bool hidden;
     // Callback to print custom help if "help" is passed
-    void (*print_help)(void);
+    void (*print_help)(struct mp_log *log);
     // Set by m_obj_list_find(). If the requested name is an old alias, this
     // is set to the old name (while the name field uses the new name).
     const char *replaced_name;
diff --git a/video/filter/vf.h b/video/filter/vf.h
index 4b27160ba3..4e7832a6e8 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -39,7 +39,7 @@ typedef struct vf_info {
     int priv_size;
     const void *priv_defaults;
     const struct m_option *options;
-    void (*print_help)(void);
+    void (*print_help)(struct mp_log *log);
 } vf_info_t;
 
 typedef struct vf_instance {
diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c
index c5d237c01d..7faf5a5b96 100644
--- a/video/filter/vf_lavfi.c
+++ b/video/filter/vf_lavfi.c
@@ -355,18 +355,16 @@ static bool is_usable(const AVFilter *filter)
            is_single_video_only(filter->outputs);
 }
 
-static void print_help(void)
+static void print_help(struct mp_log *log)
 {
-    mp_msg(MSGT_CFGPARSER, MSGL_INFO, "List of libavfilter filters:\n");
+    mp_info(log, "List of libavfilter filters:\n");
     for (const AVFilter *filter = avfilter_next(NULL); filter;
          filter = avfilter_next(filter))
     {
-        if (is_usable(filter)) {
-            mp_msg(MSGT_CFGPARSER, MSGL_INFO, " %-16s %s\n",
-                   filter->name, filter->description);
-        }
+        if (is_usable(filter))
+            mp_info(log, " %-16s %s\n", filter->name, filter->description);
     }
-    mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n"
+    mp_info(log, "\n"
         "This lists video->video filters only. Refer to\n"
         "\n"
         " https://ffmpeg.org/ffmpeg-filters.html\n"
diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c
index 111ab798ef..bf1a513474 100644
--- a/video/filter/vf_pp.c
+++ b/video/filter/vf_pp.c
@@ -133,10 +133,10 @@ static int vf_open(vf_instance_t *vf){
     return 1;
 }
 
-static void print_help(void)
+static void print_help(struct mp_log *log)
 {
-    mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", pp_help);
-    mp_msg(MSGT_CFGPARSER, MSGL_INFO,
+    mp_info(log, "%s", pp_help);
+    mp_info(log,
            "Don't forget to quote the filter list, e.g.: '--vf=pp=[tn:64:128:256]'\n\n");
 }
 
-- 
cgit v1.2.3