comparison cfg-mplayer.h @ 1285:202d9e2dc202

-vcodec option (maybe some other name would be better though) to select between driver types without editing codecs.conf. mplayer will default to normal codec search loop if it does not find codec for the specified driver type. config range checking for the parameter (an integer) should be cleaned, IMHO
author lgb
date Fri, 06 Jul 2001 21:17:22 +0000
parents ac5c8926a2d6
children 543a94b241a2
comparison
equal deleted inserted replaced
1284:c11ca3d1a6e9 1285:202d9e2dc202
38 38
39 #ifdef HAVE_X11 39 #ifdef HAVE_X11
40 extern char *mDisplayName; 40 extern char *mDisplayName;
41 #endif 41 #endif
42 42
43 extern int force_vcodec;
44
43 struct config conf[]={ 45 struct config conf[]={
44 /* name, pointer, type, flags, min, max */ 46 /* name, pointer, type, flags, min, max */
45 {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */ 47 {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */
46 {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n", 48 {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
47 CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, 49 CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
53 {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1}, 55 {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1},
54 #ifdef HAVE_X11 56 #ifdef HAVE_X11
55 {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0}, 57 {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0},
56 #endif 58 #endif
57 {"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 }, 59 {"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 },
60 {"vcodec", &force_vcodec, CONF_TYPE_INT, CONF_RANGE, 1, 5 },
58 #ifdef HAVE_LIBCSS 61 #ifdef HAVE_LIBCSS
59 {"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0}, 62 {"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0},
60 {"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0}, 63 {"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0},
61 {"dvd", "Option -dvd will be \"full disk\" mode, old meaning has been renamed to -dvdauth.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, 64 {"dvd", "Option -dvd will be \"full disk\" mode, old meaning has been renamed to -dvdauth.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
62 #else 65 #else