summaryrefslogtreecommitdiffstats
path: root/m_option.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-13 17:38:30 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-13 17:38:30 +0000
commit9cc5a0f4abbdf452e46e9ad07bb12ccc09495a77 (patch)
treee61823703ebbf9202310608bef15bee3c37f7eec /m_option.c
parent978dd0fc27b1954db1f03c3605cbc1e23cd0edb8 (diff)
downloadmpv-9cc5a0f4abbdf452e46e9ad07bb12ccc09495a77.tar.bz2
mpv-9cc5a0f4abbdf452e46e9ad07bb12ccc09495a77.tar.xz
CONF_TYPE_IMGFMT now supports 0xffffffff (hexa)-style fourccs too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10598 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'm_option.c')
-rw-r--r--m_option.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/m_option.c b/m_option.c
index fc241ee984..825a085224 100644
--- a/m_option.c
+++ b/m_option.c
@@ -961,7 +961,9 @@ static int parse_imgfmt(m_option_t* opt,char *name, char *param, void* dst, int
mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n");
return M_OPT_EXIT;
}
-
+
+ if (sscanf(param, "0x%x", &fmt) != 1)
+ {
for(i = 0 ; mp_imgfmt_list[i].name ; i++) {
if(!strcasecmp(param,mp_imgfmt_list[i].name)) {
fmt=mp_imgfmt_list[i].fmt;
@@ -972,6 +974,7 @@ static int parse_imgfmt(m_option_t* opt,char *name, char *param, void* dst, int
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: unknown format name: '%s'\n",name,param);
return M_OPT_INVALID;
}
+ }
if(dst)
*((uint32_t*)dst) = fmt;