diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-17 21:51:18 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-17 21:51:18 +0000 |
| commit | 51e8f97ef7a90fef7152c2f5c6d11cd010ccfa9e (patch) | |
| tree | b6d238b12c49a408962cc6973995ec8a368d90c7 /cfg-common.h | |
| parent | c4d86b833e6b595ede4d8b3bd128acf50251dca5 (diff) | |
| download | mpv-51e8f97ef7a90fef7152c2f5c6d11cd010ccfa9e.tar.bz2 mpv-51e8f97ef7a90fef7152c2f5c6d11cd010ccfa9e.tar.xz | |
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5670 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
| -rw-r--r-- | cfg-common.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/cfg-common.h b/cfg-common.h index 6b7a48965c..89b2b37b07 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -99,7 +99,28 @@ {"tv", "MPlayer was compiled without TV Interface support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - {"vop", &vo_plugin_args, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, + {"vop", &vo_plugin_args, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, + +// ------------------------- subtitles options -------------------- + +#ifdef USE_SUB + {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, +#ifdef USE_ICONV + {"subcp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL}, +#endif + {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, + {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, + {"noautosub", &sub_auto, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"unicode", &sub_unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"nounicode", &sub_unicode, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"utf8", &sub_utf8, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"noutf8", &sub_utf8, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"subpos",&sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, +#endif +#ifdef USE_OSD + {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL}, +#endif #else |