Mercurial > mplayer.hg

comparison cfg-mplayer.h @ 33701:09bdaa0c82b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make vobsub options available in mencoder, though with my test file it seems to not work quite right but stops adding subtitles after some minutes.
author reimar
date Fri, 01 Jul 2011 17:43:40 +0000
parents beeeb43440fd
children 11d9ef2177ec
comparison
equal deleted inserted replaced
33700:e41218a2fe36 33701:09bdaa0c82b3
33 #include "libvo/geometry.h" 33 #include "libvo/geometry.h"
34 #include "libvo/vo_dxr2.h" 34 #include "libvo/vo_dxr2.h"
35 #include "libvo/vo_fbdev.h" 35 #include "libvo/vo_fbdev.h"
36 #include "libvo/vo_zr.h" 36 #include "libvo/vo_zr.h"
37 #include "mp_fifo.h" 37 #include "mp_fifo.h"
38 #include "sub/unrar_exec.h"
39 38
40 39
41 const m_option_t vd_conf[]={ 40 const m_option_t vd_conf[]={
42 {"help", "Use MPlayer with an appropriate video file instead of live partners to avoid vd.\n", CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, 41 {"help", "Use MPlayer with an appropriate video file instead of live partners to avoid vd.\n", CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
43 {NULL, NULL, 0, 0, 0, 0, NULL} 42 {NULL, NULL, 0, 0, 0, 0, NULL}
254 #endif /* CONFIG_FRIBIDI */ 253 #endif /* CONFIG_FRIBIDI */
255 #else 254 #else
256 {"menu", "OSD menu support was not compiled in.\n", CONF_TYPE_PRINT,0, 0, 0, NULL}, 255 {"menu", "OSD menu support was not compiled in.\n", CONF_TYPE_PRINT,0, 0, 0, NULL},
257 #endif /* CONFIG_MENU */ 256 #endif /* CONFIG_MENU */
258 257
259 // these should be moved to -common, and supported in MEncoder
260 {"vobsub", &vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
261 {"vobsubid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
262 #ifdef CONFIG_UNRAR_EXEC
263 {"unrarexec", &unrar_executable, CONF_TYPE_STRING, 0, 0, 0, NULL},
264 #endif
265
266 {"sstep", &step_sec, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, 258 {"sstep", &step_sec, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
267 259
268 {"framedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 260 {"framedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 0, 1, NULL},
269 {"hardframedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 0, 2, NULL}, 261 {"hardframedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 0, 2, NULL},
270 {"noframedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 1, 0, NULL}, 262 {"noframedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 1, 0, NULL},