summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-07 22:42:04 +0200
committerwm4 <wm4@nowhere>2013-06-08 17:08:20 +0200
commit96338c6c17f707c259e026a6cba0f5d36d3d3cc5 (patch)
tree6d2ba32679daf4804c49ab365695a8775e3d856f /core
parent757c6d03940bd32fcadbb09deaa45d6c3e09059d (diff)
downloadmpv-96338c6c17f707c259e026a6cba0f5d36d3d3cc5.tar.bz2
mpv-96338c6c17f707c259e026a6cba0f5d36d3d3cc5.tar.xz
core: rename cfg-mplayer.h to options.c
Diffstat (limited to 'core')
-rw-r--r--core/mplayer.c4
-rw-r--r--core/options.c (renamed from core/cfg-mplayer.h)0
2 files changed, 2 insertions, 2 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index ea3b053f40..6310a9c271 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -199,6 +199,8 @@ static const char av_desync_help_text[] = _(
#include "core/mp_common.h"
#include "core/command.h"
+#include "core/options.c"
+
static void reset_subtitles(struct MPContext *mpctx);
static void reinit_subs(struct MPContext *mpctx);
static struct track *open_external_file(struct MPContext *mpctx, char *filename,
@@ -637,8 +639,6 @@ static void mk_config_dir(char *subdir)
talloc_free(tmp);
}
-#include "cfg-mplayer.h"
-
static int cfg_include(struct m_config *conf, char *filename)
{
return m_config_parse_config_file(conf, filename);
diff --git a/core/cfg-mplayer.h b/core/options.c
index 5ee8770d2d..5ee8770d2d 100644
--- a/core/cfg-mplayer.h
+++ b/core/options.c