core: move contents to mpvcore (2/2)

Followup commit. Fixes all the files references.

8 files changed, 14 insertions, 14 deletions

diff --git a/audio/filter/af.c b/audio/filter/af.c
index 91f3e907f1..7a8dc406cf 100644
--- a/audio/filter/af.c
+++ b/audio/filter/af.c
@@ -22,8 +22,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "core/m_option.h"
-#include "core/m_config.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/m_config.h"
 
 #include "af.h"
 
diff --git a/audio/filter/af.h b/audio/filter/af.h
index df4e03b49a..23dfa9d4fb 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -24,12 +24,12 @@
 
 #include "config.h"
 
-#include "core/options.h"
+#include "mpvcore/options.h"
 #include "audio/format.h"
 #include "audio/chmap.h"
 #include "audio/audio.h"
 #include "control.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 struct af_instance;
 
diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
index a75be27f8a..e8178ea549 100644
--- a/audio/filter/af_bs2b.c
+++ b/audio/filter/af_bs2b.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "af.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 /// Internal specific data of the filter
 struct af_bs2b {
diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c
index ea0aa938ca..b4286c0e62 100644
--- a/audio/filter/af_export.c
+++ b/audio/filter/af_export.c
@@ -39,7 +39,7 @@
 
 #include "talloc.h"
 #include "af.h"
-#include "core/path.h"
+#include "mpvcore/path.h"
 
 #define DEF_SZ 512 // default buffer size (in samples)
 #define SHARED_FILE "mpv-af_export" /* default file name
diff --git a/audio/filter/af_force.c b/audio/filter/af_force.c
index 75424167b9..adf17c61f2 100644
--- a/audio/filter/af_force.c
+++ b/audio/filter/af_force.c
@@ -19,7 +19,7 @@
 
 #include <libavutil/common.h>
 
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 #include "audio/format.h"
 #include "af.h"
diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c
index 3a0929b622..6b8a66d326 100644
--- a/audio/filter/af_lavfi.c
+++ b/audio/filter/af_lavfi.c
@@ -38,8 +38,8 @@
 #include "audio/fmt-conversion.h"
 #include "af.h"
 
-#include "core/m_option.h"
-#include "core/av_opts.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/av_opts.h"
 
 #define IS_LIBAV_FORK (LIBAVFILTER_VERSION_MICRO < 100)
 
diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c
index 177f4048b9..52df9c2810 100644
--- a/audio/filter/af_lavrresample.c
+++ b/audio/filter/af_lavrresample.c
@@ -50,9 +50,9 @@
 #error "config.h broken"
 #endif
 
-#include "core/mp_msg.h"
-#include "core/m_option.h"
-#include "core/av_opts.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/av_opts.h"
 #include "audio/filter/af.h"
 #include "audio/fmt-conversion.h"
 #include "audio/reorder_ch.h"
diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index d409ed85cf..dfc830799b 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -36,10 +36,10 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
 
 #include "af.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 // Data for specific instances of this filter
 typedef struct af_scaletempo_s