summaryrefslogtreecommitdiffstats
path: root/player/main.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 02:02:25 +0100
committerwm4 <wm4@nowhere>2013-12-17 02:07:57 +0100
commiteb15151705d47d23da844449126cc6b4879f110e (patch)
tree661866ee9e73bc893c7963660aae01db503e99aa /player/main.c
parent793f85945fc07db905e54390c065ae51b9eeef9b (diff)
downloadmpv-eb15151705d47d23da844449126cc6b4879f110e.tar.bz2
mpv-eb15151705d47d23da844449126cc6b4879f110e.tar.xz
Move options/config related files from mpvcore/ to options/
Since m_option.h and options.h are extremely often included, a lot of files have to be changed. Moving path.c/h to options/ is a bit questionable, but since this is mainly about access to config files (which are also handled in options/), it's probably ok.
Diffstat (limited to 'player/main.c')
-rw-r--r--player/main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/player/main.c b/player/main.c
index cfaf6f47d5..dfab92eefc 100644
--- a/player/main.c
+++ b/player/main.c
@@ -36,17 +36,17 @@
#include "mpvcore/codecs.h"
#include "mpvcore/cpudetect.h"
#include "mpvcore/encode.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_property.h"
+#include "options/m_config.h"
+#include "options/m_option.h"
+#include "options/m_property.h"
#include "mpvcore/mp_common.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mpv_global.h"
-#include "mpvcore/parser-cfg.h"
-#include "mpvcore/parser-mpcmd.h"
+#include "options/parse_configfile.h"
+#include "options/parse_commandline.h"
#include "mpvcore/playlist.h"
#include "mpvcore/playlist_parser.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "input/input.h"
#include "audio/decode/dec_audio.h"