[Mplayer-cvslog] CVS: main m_option.c,1.17,1.18

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv29926

Modified Files:
	m_option.c 
Log Message:
CONF_TYPE_IMGFMT now supports 0xffffffff (hexa)-style fourccs too

Index: m_option.c
===================================================================
RCS file: /cvsroot/mplayer/main/m_option.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- m_option.c	13 Aug 2003 16:44:39 -0000	1.17
+++ m_option.c	13 Aug 2003 17:38:30 -0000	1.18
@@ -961,7 +961,9 @@
     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;
@@ -971,6 +973,7 @@
   if(!mp_imgfmt_list[i].name) {
     mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: unknown format name: '%s'\n",name,param);
     return M_OPT_INVALID;
+  }
   }
 
   if(dst)