# HG changeset patch # User szabii # Date 985025661 0 # Node ID effc62af528c4a7dcb2dfdc87e51ab191de804aa # Parent 9008302e2dc04e0dccdc1beaccc98225476f811d new option: -include diff -r 9008302e2dc0 -r effc62af528c cfg-mplayer.h --- a/cfg-mplayer.h Mon Mar 19 15:09:47 2001 +0000 +++ b/cfg-mplayer.h Mon Mar 19 18:14:21 2001 +0000 @@ -4,6 +4,7 @@ struct config conf[]={ /* name, pointer, type, flags, min, max */ + {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */ {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0}, diff -r 9008302e2dc0 -r effc62af528c mplayer.c --- a/mplayer.c Mon Mar 19 15:09:47 2001 +0000 +++ b/mplayer.c Mon Mar 19 18:14:21 2001 +0000 @@ -83,6 +83,10 @@ return 0; } +static int cfg_include(struct config *conf, char *filename){ + return parse_config_file(conf, filename); +} + static int max_framesize=0; static int dbg_es_sent=0; diff -r 9008302e2dc0 -r effc62af528c mplayerHQ.c --- a/mplayerHQ.c Mon Mar 19 15:09:47 2001 +0000 +++ b/mplayerHQ.c Mon Mar 19 18:14:21 2001 +0000 @@ -85,6 +85,10 @@ return 0; } +static int cfg_include(struct config *conf, char *filename){ + return parse_config_file(conf, filename); +} + static int max_framesize=0; static int dbg_es_sent=0;