From eb15151705d47d23da844449126cc6b4879f110e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 17 Dec 2013 02:02:25 +0100
Subject: 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.
---
 demux/demux.c           | 2 +-
 demux/demux_lavf.c      | 4 ++--
 demux/demux_libass.c    | 2 +-
 demux/demux_mkv.c       | 2 +-
 demux/demux_playlist.c  | 4 ++--
 demux/demux_raw.c       | 2 +-
 demux/demux_subreader.c | 2 +-
 demux/mf.c              | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'demux')

diff --git a/demux/demux.c b/demux/demux.c
index 7ae9328e3b..626804fcef 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 
 #include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/av_common.h"
 #include "talloc.h"
 #include "mpvcore/mp_msg.h"
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 4accb6d8fb..c541f345e1 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -35,7 +35,7 @@
 #include "compat/libav.h"
 
 #include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/av_opts.h"
 #include "mpvcore/av_common.h"
@@ -44,7 +44,7 @@
 #include "stream/stream.h"
 #include "demux.h"
 #include "stheader.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 #define INITIAL_PROBE_SIZE STREAM_BUFFER_SIZE
 #define PROBE_BUF_SIZE FFMIN(STREAM_MAX_BUFFER_SIZE, 2 * 1024 * 1024)
diff --git a/demux/demux_libass.c b/demux/demux_libass.c
index f304757ae3..15e149212b 100644
--- a/demux/demux_libass.c
+++ b/demux/demux_libass.c
@@ -21,7 +21,7 @@
 #include <ass/ass.h>
 #include <ass/ass_types.h>
 
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/charset_conv.h"
 #include "stream/stream.h"
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 94af8bf6b9..b3cf253be5 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -42,7 +42,7 @@
 #endif
 
 #include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/bstr.h"
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c
index dc42c2ea1f..1a4882f92b 100644
--- a/demux/demux_playlist.c
+++ b/demux/demux_playlist.c
@@ -16,10 +16,10 @@
  */
 
 #include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/playlist.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "stream/stream.h"
 #include "demux.h"
 
diff --git a/demux/demux_raw.c b/demux/demux_raw.c
index ecabd2e714..12fa1741a8 100644
--- a/demux/demux_raw.c
+++ b/demux/demux_raw.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index 21bcf21614..a3cee1794b 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -34,7 +34,7 @@
 #include "config.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "stream/stream.h"
 #include "demux/demux.h"
 
diff --git a/demux/mf.c b/demux/mf.c
index 443e2e411b..7b5b7aee3e 100644
--- a/demux/mf.c
+++ b/demux/mf.c
@@ -39,7 +39,7 @@
 #include "talloc.h"
 #include "mpvcore/mp_msg.h"
 #include "stream/stream.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "mpvcore/mp_talloc.h"
 
 #include "mf.h"
-- 
cgit v1.2.3