summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorszabii <szabii@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-03-19 18:14:21 +0000
committerszabii <szabii@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-03-19 18:14:21 +0000
commit5c58141a5fae7c0767b7fc0599f274c77cb738d5 (patch)
treeebfe2a16753a933a1c2d3b2f103adfacd79c7a8d /mplayer.c
parented05b55be4916b56938bbf5d369932f8d97b8839 (diff)
downloadmpv-5c58141a5fae7c0767b7fc0599f274c77cb738d5.tar.bz2
mpv-5c58141a5fae7c0767b7fc0599f274c77cb738d5.tar.xz
new option: -include
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@163 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index b58bb32cb8..dbf30d977c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -83,6 +83,10 @@ static int cfg_inc_verbose(struct config *conf){
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;