Mercurial > mplayer.hg
comparison cfg-common.h @ 21430:597505748535
Remove long-deprecated -vop option.
author | diego |
---|---|
date | Sat, 02 Dec 2006 17:32:53 +0000 |
parents | ad7747bce52d |
children | 1e8b1b5b1ccc |
comparison
equal
deleted
inserted
replaced
21429:d4cb537b3414 | 21430:597505748535 |
---|---|
195 {"nosound", &audio_id, CONF_TYPE_FLAG, 0, -1, -2, NULL}, | 195 {"nosound", &audio_id, CONF_TYPE_FLAG, 0, -1, -2, NULL}, |
196 | 196 |
197 {"af-adv", audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, | 197 {"af-adv", audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |
198 {"af", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, | 198 {"af", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, |
199 | 199 |
200 {"vop*", &vo_plugin_args, CONF_TYPE_OBJ_SETTINGS_LIST, 0, 0, 0,&vf_obj_list }, | 200 {"vop", "-vop has been removed, use -vf instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL}, |
201 {"vf*", &vf_settings, CONF_TYPE_OBJ_SETTINGS_LIST, 0, 0, 0, &vf_obj_list}, | 201 {"vf*", &vf_settings, CONF_TYPE_OBJ_SETTINGS_LIST, 0, 0, 0, &vf_obj_list}, |
202 // select audio/video codec (by name) or codec family (by number): | 202 // select audio/video codec (by name) or codec family (by number): |
203 // {"afm", &audio_family, CONF_TYPE_INT, CONF_MIN, 0, 22, NULL}, // keep ranges in sync | 203 // {"afm", &audio_family, CONF_TYPE_INT, CONF_MIN, 0, 22, NULL}, // keep ranges in sync |
204 // {"vfm", &video_family, CONF_TYPE_INT, CONF_MIN, 0, 29, NULL}, // with codec-cfg.c | 204 // {"vfm", &video_family, CONF_TYPE_INT, CONF_MIN, 0, 29, NULL}, // with codec-cfg.c |
205 // {"afm", &audio_fm, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 205 // {"afm", &audio_fm, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
553 {"h", &mf_h, CONF_TYPE_INT, 0, 0, 0, NULL}, | 553 {"h", &mf_h, CONF_TYPE_INT, 0, 0, 0, NULL}, |
554 {"fps", &mf_fps, CONF_TYPE_FLOAT, 0, 0, 0, NULL}, | 554 {"fps", &mf_fps, CONF_TYPE_FLOAT, 0, 0, 0, NULL}, |
555 {"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 555 {"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
556 {NULL, NULL, 0, 0, 0, 0, NULL} | 556 {NULL, NULL, 0, 0, 0, 0, NULL} |
557 }; | 557 }; |
558 | |
559 extern m_obj_settings_t* vo_plugin_args; | |
560 | 558 |
561 #include "libaf/af.h" | 559 #include "libaf/af.h" |
562 extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c | 560 extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c |
563 m_option_t audio_filter_conf[]={ | 561 m_option_t audio_filter_conf[]={ |
564 {"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, | 562 {"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, |