From b5ed6148394062fbc8ac101bd1efe918470ac585 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 23 Nov 2013 21:34:24 +0100
Subject: options: implement --pphelp differently

Make it work via --vf=pp:help instead.
---
 DOCS/man/en/changes.rst | 1 +
 DOCS/man/en/options.rst | 3 ---
 DOCS/man/en/vf.rst      | 2 +-
 mpvcore/options.c       | 5 -----
 video/filter/vf.c       | 1 +
 video/filter/vf.h       | 1 +
 video/filter/vf_pp.c    | 6 ++++++
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 001a7a1dce..8740dcdb55 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -177,6 +177,7 @@ Command Line Switches
     ``-zoom``                   Inverse available as ``--video-unscaled``
     ``-panscanrange``           ``--video-zoom``, ``--video-pan-x/y``
     ``-pp``                     ``-vf=pp``
+    ``-pphelp``                 ``--vf=pp:help``
     =========================== ========================================
 
 .. note::
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index d72dad4343..386f0fdf76 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1620,9 +1620,6 @@ OPTIONS
 
         FIXME: This needs to be clarified and documented thoroughly.
 
-``--pphelp``
-    See also ``--vf=pp``.
-
 ``--priority=<prio>``
     (Windows only.)
     Set process priority for mpv according to the predefined priorities
diff --git a/DOCS/man/en/vf.rst b/DOCS/man/en/vf.rst
index 477cd37c83..64ea051391 100644
--- a/DOCS/man/en/vf.rst
+++ b/DOCS/man/en/vf.rst
@@ -250,7 +250,7 @@ Available filters are:
 
     .. note::
 
-        ``--pphelp`` shows a list of available subfilters.
+        ``--vf=pp:help`` shows a list of available subfilters.
 
     Available subfilters are:
 
diff --git a/mpvcore/options.c b/mpvcore/options.c
index e01bce9959..b584099eff 100644
--- a/mpvcore/options.c
+++ b/mpvcore/options.c
@@ -61,7 +61,6 @@ extern const m_option_t demux_rawvideo_opts[];
 extern const m_option_t cdda_opts[];
 
 extern int sws_flags;
-extern const char pp_help[];
 
 extern const char mp_help_text[];
 
@@ -491,10 +490,6 @@ const m_option_t mp_opts[] = {
                 {"vaapi-copy", 5})),
     OPT_STRING("hwdec-codecs", hwdec_codecs, 0),
 
-#if HAVE_LIBPOSTPROC
-    {"pphelp", (void *) &pp_help, CONF_TYPE_PRINT, CONF_GLOBAL | CONF_NOCFG, 0, 0, NULL},
-#endif
-
     // scaling:
     {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL},
     {"ssf", (void *) scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
diff --git a/video/filter/vf.c b/video/filter/vf.c
index 9a8c1bba04..212fc1d7a5 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -131,6 +131,7 @@ static bool get_desc(struct m_obj_desc *dst, int index)
         .priv_defaults = vf->priv_defaults,
         .options = vf->options,
         .p = vf,
+        .print_help = vf->print_help,
     };
     return true;
 }
diff --git a/video/filter/vf.h b/video/filter/vf.h
index 9b86cd117c..f6e4d5a9a8 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -38,6 +38,7 @@ typedef struct vf_info {
     int priv_size;
     const void *priv_defaults;
     const struct m_option *options;
+    void (*print_help)(void);
 } vf_info_t;
 
 struct vf_format {
diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c
index 68ec22bd22..32ec088e0c 100644
--- a/video/filter/vf_pp.c
+++ b/video/filter/vf_pp.c
@@ -153,10 +153,16 @@ static int vf_open(vf_instance_t *vf, char *args){
     return 1;
 }
 
+static void print_help(void)
+{
+    mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", pp_help);
+}
+
 const vf_info_t vf_info_pp = {
     .description = "postprocessing",
     .name = "pp",
     .open = vf_open,
+    .print_help = print_help,
 };
 
 //===========================================================================//
-- 
cgit v1.2.3