summaryrefslogtreecommitdiffstats
path: root/m_option.c
diff options
context:
space:
mode:
authorgpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-02 08:29:30 +0000
committergpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-02 08:29:30 +0000
commit43844d090c5580b71228c7a13efa7ce13b37cab8 (patch)
tree4eba848365b1290435183da2cd7e2d95865b20f0 /m_option.c
parent2a9b3541abe07838a0fe62fa1524a934488393d1 (diff)
downloadmpv-43844d090c5580b71228c7a13efa7ce13b37cab8.tar.bz2
mpv-43844d090c5580b71228c7a13efa7ce13b37cab8.tar.xz
allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
This one makes mplayer -vo help -ao help -ac help -vc help -pphelp -af help -vfm help -vf help -afm help -fstype help produce the desired output. From the thread: Date: Jul 16, 2005 8:25 PM Subject: [MPlayer-dev-eng] [PATCH] allow multiple help clauses on the command line git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16346 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'm_option.c')
-rw-r--r--m_option.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/m_option.c b/m_option.c
index 2980c0adbb..13551cd26c 100644
--- a/m_option.c
+++ b/m_option.c
@@ -1005,7 +1005,7 @@ static int parse_imgfmt(m_option_t* opt,char *name, char *param, void* dst, int
for(i = 0 ; mp_imgfmt_list[i].name ; i++)
mp_msg(MSGT_CFGPARSER, MSGL_INFO, " %s",mp_imgfmt_list[i].name);
mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n");
- return M_OPT_EXIT;
+ return M_OPT_EXIT - 1;
}
if (sscanf(param, "0x%x", &fmt) != 1)
@@ -1093,7 +1093,7 @@ static int parse_afmt(m_option_t* opt,char *name, char *param, void* dst, int sr
for(i = 0 ; mp_afmt_list[i].name ; i++)
mp_msg(MSGT_CFGPARSER, MSGL_INFO, " %s",mp_afmt_list[i].name);
mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n");
- return M_OPT_EXIT;
+ return M_OPT_EXIT - 1;
}
if (sscanf(param, "0x%x", &fmt) != 1)
@@ -1212,7 +1212,7 @@ static int get_obj_params(char* opt_name, char* name,char* params,
char min[50],max[50];
if(!desc->fields) {
printf("%s doesn't have any options.\n\n",name);
- return M_OPT_EXIT;
+ return M_OPT_EXIT - 1;
}
printf("\n Name Type Min Max\n\n");
for(n = 0 ; desc->fields[n].name ; n++) {
@@ -1233,7 +1233,7 @@ static int get_obj_params(char* opt_name, char* name,char* params,
max);
}
printf("\n");
- return M_OPT_EXIT;
+ return M_OPT_EXIT - 1;
}
for(nopts = 0 ; desc->fields[nopts].name ; nopts++)
@@ -1545,7 +1545,7 @@ static int parse_obj_settings_list(m_option_t* opt,char *name,
mp_msg(MSGT_VFILTER,MSGL_INFO," %-15s: %s\n",
M_ST_MB(char*,ol->list[n],ol->name_off),
M_ST_MB(char*,ol->list[n],ol->info_off));
- return M_OPT_EXIT;
+ return M_OPT_EXIT - 1;
}
ptr = str = strdup(param);
@@ -1688,7 +1688,7 @@ static int parse_obj_presets(m_option_t* opt,char *name,
pre += s)
mp_msg(MSGT_CFGPARSER, MSGL_ERR, " %s",pre_name);
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "\n");
- return M_OPT_EXIT;
+ return M_OPT_EXIT - 1;
}
for(pre_name = M_ST_MB(char*,pre,obj_p->name_off) ; pre_name ;