Mercurial > mplayer.hg
comparison cfg-common.h @ 9593:e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
Syntax is we decided, so you can give the nomes or not with both
vop and vf. vf take precedence over vop.
author | albeu |
---|---|
date | Sat, 15 Mar 2003 18:01:02 +0000 |
parents | 46340b0f5a91 |
children | 76c6d8f1ebf5 |
comparison
equal
deleted
inserted
replaced
9592:b20b0c80298b | 9593:e9a2af584986 |
---|---|
148 {"npp", "-npp has been removed, use -vop pp and read the fine manual\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 148 {"npp", "-npp has been removed, use -vop pp and read the fine manual\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
149 #ifdef USE_LIBAVCODEC | 149 #ifdef USE_LIBAVCODEC |
150 {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL}, | 150 {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL}, |
151 #endif | 151 #endif |
152 | 152 |
153 {"vop", &vo_plugin_args, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, | 153 {"vop", &vo_plugin_args, CONF_TYPE_OBJ_SETTINGS_LIST, 0, 0, 0,&vf_obj_list }, |
154 {"vf", &vf_settings, CONF_TYPE_OBJ_SETTINGS_LIST, 0, 0, 0, &vf_obj_list}, | |
154 | 155 |
155 // scaling: | 156 // scaling: |
156 {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL}, | 157 {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL}, |
157 {"ssf", scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, | 158 {"ssf", scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |
158 {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 159 {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
334 extern int mf_support; | 335 extern int mf_support; |
335 extern int mf_w; | 336 extern int mf_w; |
336 extern int mf_h; | 337 extern int mf_h; |
337 extern float mf_fps; | 338 extern float mf_fps; |
338 extern char * mf_type; | 339 extern char * mf_type; |
340 extern m_obj_settings_t* vf_settings; | |
341 extern m_obj_list_t vf_obj_list; | |
339 | 342 |
340 struct config mfopts_conf[]={ | 343 struct config mfopts_conf[]={ |
341 {"on", &mf_support, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 344 {"on", &mf_support, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
342 {"w", &mf_w, CONF_TYPE_INT, 0, 0, 0, NULL}, | 345 {"w", &mf_w, CONF_TYPE_INT, 0, 0, 0, NULL}, |
343 {"h", &mf_h, CONF_TYPE_INT, 0, 0, 0, NULL}, | 346 {"h", &mf_h, CONF_TYPE_INT, 0, 0, 0, NULL}, |
344 {"fps", &mf_fps, CONF_TYPE_FLOAT, 0, 0, 0, NULL}, | 347 {"fps", &mf_fps, CONF_TYPE_FLOAT, 0, 0, 0, NULL}, |
345 {"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 348 {"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
346 {NULL, NULL, 0, 0, 0, 0, NULL} | 349 {NULL, NULL, 0, 0, 0, 0, NULL} |
347 }; | 350 }; |
348 | 351 |
349 extern char** vo_plugin_args; | 352 extern m_obj_settings_t* vo_plugin_args; |
350 | 353 |
351 #include "libaf/af.h" | 354 #include "libaf/af.h" |
352 extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c | 355 extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c |
353 struct config audio_filter_conf[]={ | 356 struct config audio_filter_conf[]={ |
354 {"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, | 357 {"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, |