summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorpavelxdd <pavel.otchertsov@gmail.com>2017-12-11 21:41:10 +0300
committerJan Ekström <jeebjp@gmail.com>2017-12-11 21:56:20 +0200
commit6c8e7daebb64da59325c4fca10dd3274702ff4f4 (patch)
treee46ef257a23a16c979855863386f4d219336e662 /options
parentcdb6cb55e05c05897ee3da91bb8979812fbb4602 (diff)
downloadmpv-6c8e7daebb64da59325c4fca10dd3274702ff4f4.tar.bz2
mpv-6c8e7daebb64da59325c4fca10dd3274702ff4f4.tar.xz
options: don't report errors on help value for OPT_GEOMETRY
The same idea as in 3723e61 but for OPT_GEOMETRY now.
Diffstat (limited to 'options')
-rw-r--r--options/m_option.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/options/m_option.c b/options/m_option.c
index e9ffe5d491..e08cfa882b 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -1962,6 +1962,10 @@ void m_geometry_apply(int *xpos, int *ypos, int *widw, int *widh,
static int parse_geometry(struct mp_log *log, const m_option_t *opt,
struct bstr name, struct bstr param, void *dst)
{
+ bool is_help = bstr_equals0(param, "help");
+ if (is_help)
+ goto error;
+
struct m_geometry gm;
if (!parse_geometry_str(&gm, param))
goto error;
@@ -1972,10 +1976,13 @@ static int parse_geometry(struct mp_log *log, const m_option_t *opt,
return 1;
error:
- mp_err(log, "Option %.*s: invalid geometry: '%.*s'\n",
- BSTR_P(name), BSTR_P(param));
- mp_err(log, "Valid format: [W[%%][xH[%%]]][{+-}X[%%]{+-}Y[%%]] | [X[%%]:Y[%%]]\n");
- return M_OPT_INVALID;
+ if (!is_help) {
+ mp_err(log, "Option %.*s: invalid geometry: '%.*s'\n",
+ BSTR_P(name), BSTR_P(param));
+ }
+ mp_info(log,
+ "Valid format: [W[%%][xH[%%]]][{+-}X[%%]{+-}Y[%%]] | [X[%%]:Y[%%]]\n");
+ return is_help ? M_OPT_EXIT : M_OPT_INVALID;
}
const m_option_type_t m_option_type_geometry = {