diff options
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/video_out.c | 10 | ||||
| -rw-r--r-- | libvo/vo_dxr2.c | 11 |
2 files changed, 1 insertions, 20 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 5793aff8b9..ce0b3d9130 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -184,16 +184,6 @@ vo_functions_t* video_out_drivers[] = NULL }; -#ifdef HAVE_DXR2 -extern void vo_dxr2_register_options(void*); -#endif - -void libvo_register_options(void* cfg) { -#ifdef HAVE_DXR2 - vo_dxr2_register_options(cfg); -#endif -} - void list_video_out(){ int i=0; mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputDrivers); diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c index 535501865e..933e6fcfe4 100644 --- a/libvo/vo_dxr2.c +++ b/libvo/vo_dxr2.c @@ -61,7 +61,7 @@ static int mute_mode = DXR2_AUDIO_MUTE_OFF; static int ignore_cache = 0; static int update_cache = 0; -static config_t dxr2_opts[] = { +config_t dxr2_opts[] = { { "overlay", &use_ol, CONF_TYPE_FLAG, 0, 0, 1, NULL}, { "nooverlay", &use_ol, CONF_TYPE_FLAG, 0, 1, 0, NULL}, { "overlay-ratio", &ol_ratio, CONF_TYPE_INT, CONF_RANGE, 1, 2500, NULL }, @@ -96,15 +96,6 @@ static config_t dxr2_opts[] = { { NULL,NULL, 0, 0, 0, 0, NULL} }; -static config_t dxr2_opt[] = { - { "dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - { NULL,NULL, 0, 0, 0, 0, NULL} -}; - -void vo_dxr2_register_options(m_config_t* cfg) { - m_config_register_options(cfg,dxr2_opt); -} - static vo_info_t vo_info = { "DXR2 video out", "dxr2", |