RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

options: make imgfmt options always accept "no" 

This was optional, with the intention that normally such options require
a valid format. But there is no reason for this (at least not anymore),
and it's actually more logical to accept "no" in all situations this
option type is used. This also gets rid of the weird min field special
use.
This commit is contained in:
wm4 2020-04-09 11:20:45 +02:00
parent 9d32d62b61
commit 823e5205ea
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
options/m_option.c
View File

@ -2356,8 +2356,6 @@ const m_option_type_t m_option_type_size_box = {
static int parse_imgfmt(struct mp_log *log, const m_option_t *opt,
struct bstr name, struct bstr param, void *dst)
{
bool accept_no = opt->min < 0;
if (param.len == 0)
return M_OPT_MISSING_PARAM;
@ -2366,15 +2364,14 @@ static int parse_imgfmt(struct mp_log *log, const m_option_t *opt,
char **list = mp_imgfmt_name_list();
for (int i = 0; list[i]; i++)
mp_info(log, " %s", list[i]);
if (accept_no)
mp_info(log, " no");
mp_info(log, " no");
mp_info(log, "\n");
talloc_free(list);
return M_OPT_EXIT;
}
unsigned int fmt = mp_imgfmt_from_name(param);
if (!fmt && !(accept_no && bstr_equals0(param, "no"))) {
if (!fmt && !bstr_equals0(param, "no")) {
mp_err(log, "Option %.*s: unknown format name: '%.*s'\n",
BSTR_P(name), BSTR_P(param));
return M_OPT_INVALID;

2
video/decode/vd_lavc.c
View File

@ -120,7 +120,7 @@ const struct m_sub_options vd_lavc_conf = {
{"hwdec", OPT_STRING_VALIDATE(hwdec_api, hwdec_validate_opt),
.flags = M_OPT_OPTIONAL_PARAM | UPDATE_HWDEC},
{"hwdec-codecs", OPT_STRING(hwdec_codecs)},
{"hwdec-image-format", OPT_IMAGEFORMAT(hwdec_image_format), .min = -1},
{"hwdec-image-format", OPT_IMAGEFORMAT(hwdec_image_format)},
{"hwdec-extra-frames", OPT_INT(hwdec_extra_frames), M_RANGE(0, 256)},
{0}
},