core: move contents to mpvcore (2/2)

Followup commit. Fixes all the files references.

35 files changed, 73 insertions, 73 deletions

diff --git a/audio/audio.c b/audio/audio.c
index c9d5c9231c..e1d3a76978 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -17,7 +17,7 @@
 
 #include <assert.h>
 
-#include "core/mp_talloc.h"
+#include "mpvcore/mp_talloc.h"
 #include "audio.h"
 
 void mp_audio_set_format(struct mp_audio *mpa, int format)
diff --git a/audio/chmap.c b/audio/chmap.c
index 254d9b38da..0e714f3c83 100644
--- a/audio/chmap.c
+++ b/audio/chmap.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "chmap.h"
 
 // Names taken from libavutil/channel_layout.c (Not accessible by API.)
diff --git a/audio/chmap.h b/audio/chmap.h
index 1848c86efd..cd6c49f716 100644
--- a/audio/chmap.h
+++ b/audio/chmap.h
@@ -20,7 +20,7 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 #define MP_NUM_CHANNELS 8
 
diff --git a/audio/decode/ad.h b/audio/decode/ad.h
index 3b18c7e977..1d9ac13e35 100644
--- a/audio/decode/ad.h
+++ b/audio/decode/ad.h
@@ -19,7 +19,7 @@
 #ifndef MPLAYER_AD_H
 #define MPLAYER_AD_H
 
-#include "core/codecs.h"
+#include "mpvcore/codecs.h"
 #include "demux/stheader.h"
 #include "demux/demux.h"
 
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index da7c5aeaad..409fda4951 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -29,11 +29,11 @@
 #include "talloc.h"
 
 #include "config.h"
-#include "core/av_common.h"
-#include "core/codecs.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
-#include "core/av_opts.h"
+#include "mpvcore/av_common.h"
+#include "mpvcore/codecs.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
+#include "mpvcore/av_opts.h"
 
 #include "ad.h"
 #include "audio/reorder_ch.h"
diff --git a/audio/decode/ad_mpg123.c b/audio/decode/ad_mpg123.c
index d8cc702234..9594cb61ef 100644
--- a/audio/decode/ad_mpg123.c
+++ b/audio/decode/ad_mpg123.c
@@ -25,7 +25,7 @@
 #include "config.h"
 
 #include "ad.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 /* Reducing the ifdeffery to two main variants:
  *   1. most compatible to any libmpg123 version
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
index f3a6e3dd1f..a53513dead 100644
--- a/audio/decode/ad_spdif.c
+++ b/audio/decode/ad_spdif.c
@@ -25,9 +25,9 @@
 #include <libavutil/opt.h>
 
 #include "config.h"
-#include "core/mp_msg.h"
-#include "core/av_common.h"
-#include "core/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/av_common.h"
+#include "mpvcore/options.h"
 #include "ad.h"
 
 #define FILENAME_SPDIFENC "spdif"
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index a73027e224..c368350f71 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -26,9 +26,9 @@
 #include "demux/codec_tags.h"
 
 #include "config.h"
-#include "core/codecs.h"
-#include "core/mp_msg.h"
-#include "core/bstr.h"
+#include "mpvcore/codecs.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/bstr.h"
 
 #include "stream/stream.h"
 #include "demux/demux.h"
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
diff --git a/audio/fmt-conversion.c b/audio/fmt-conversion.c
index 4c1055f118..ce2a9054bf 100644
--- a/audio/fmt-conversion.c
+++ b/audio/fmt-conversion.c
@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */ 
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include <libavutil/avutil.h>
 #include <libavutil/samplefmt.h>
 #include "format.h"
diff --git a/audio/format.h b/audio/format.h
index f3aa3d8af0..01478afc52 100644
--- a/audio/format.h
+++ b/audio/format.h
@@ -25,7 +25,7 @@
 
 #include <sys/types.h>
 #include "config.h"
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 // Endianness
 #define AF_FORMAT_BE		(0<<0) // Big Endian
diff --git a/audio/mixer.c b/audio/mixer.c
index 7ccfaa4639..d3762628ae 100644
--- a/audio/mixer.c
+++ b/audio/mixer.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #include "audio/out/ao.h"
 #include "audio/filter/af.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "mixer.h"
 
 
diff --git a/audio/out/ao.c b/audio/out/ao.c
index 49fffb657d..5f5ad4d38c 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -27,10 +27,10 @@
 #include "ao.h"
 #include "audio/format.h"
 
-#include "core/options.h"
-#include "core/m_config.h"
-#include "core/mp_msg.h"
-#include "core/mpv_global.h"
+#include "mpvcore/options.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mpv_global.h"
 
 // there are some globals:
 struct ao *global_ao;
diff --git a/audio/out/ao.h b/audio/out/ao.h
index 65e5a3fc6b..673a252ccb 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -21,8 +21,8 @@
 
 #include <stdbool.h>
 
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_common.h"
 #include "audio/chmap.h"
 #include "audio/chmap_sel.h"
 
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index 9b1c32181d..63309c3dbd 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -36,10 +36,10 @@
 #include <alloca.h>
 
 #include "config.h"
-#include "core/options.h"
-#include "core/m_option.h"
+#include "mpvcore/options.h"
+#include "mpvcore/m_option.h"
 #include "audio/mixer.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index 59e1f82f36..a7e7b11966 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -36,9 +36,9 @@
 #include "ao.h"
 #include "audio/format.h"
 #include "osdep/timer.h"
-#include "core/m_option.h"
-#include "core/mp_ring.h"
-#include "core/mp_msg.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/mp_ring.h"
+#include "mpvcore/mp_msg.h"
 #include "audio/out/ao_coreaudio_properties.h"
 #include "audio/out/ao_coreaudio_utils.h"
 
diff --git a/audio/out/ao_coreaudio_utils.h b/audio/out/ao_coreaudio_utils.h
index 96383f9870..296f1d2497 100644
--- a/audio/out/ao_coreaudio_utils.h
+++ b/audio/out/ao_coreaudio_utils.h
@@ -22,7 +22,7 @@
 #include <AudioToolbox/AudioToolbox.h>
 #include <inttypes.h>
 #include <stdbool.h>
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "audio/out/ao.h"
 
 #define CA_CFSTR_ENCODING kCFStringEncodingASCII
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c
index 4e85460243..039df2a7ed 100644
--- a/audio/out/ao_dsound.c
+++ b/audio/out/ao_dsound.c
@@ -39,9 +39,9 @@
 #include "audio/format.h"
 #include "ao.h"
 #include "audio/reorder_ch.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "osdep/timer.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 /**
 \todo use the definitions from the win32 api headers when they define these
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index ba855cce23..579dee2631 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -27,14 +27,14 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "ao.h"
 #include "audio/format.h"
 #include "osdep/timer.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
-#include "core/mp_ring.h"
+#include "mpvcore/mp_ring.h"
 
 #include <jack/jack.h>
 
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index e72c6c903d..0631d54aea 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -28,15 +28,15 @@
 
 #include "compat/libav.h"
 #include "config.h"
-#include "core/options.h"
-#include "core/mp_common.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_common.h"
 #include "audio/format.h"
 #include "audio/reorder_ch.h"
 #include "talloc.h"
 #include "ao.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
-#include "core/encode_lavc.h"
+#include "mpvcore/encode_lavc.h"
 
 static const char *sample_padding_signed = "\x00\x00\x00\x00";
 static const char *sample_padding_u8     = "\x80";
diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c
index ccc73ba9f5..1f9115a471 100644
--- a/audio/out/ao_openal.c
+++ b/audio/out/ao_openal.c
@@ -35,12 +35,12 @@
 #include <AL/alext.h>
 #endif
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "ao.h"
 #include "audio/format.h"
 #include "osdep/timer.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 #define MAX_CHANS MP_NUM_CHANNELS
 #define NUM_BUF 128
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c
index 08d80bf7fd..0e17bcb632 100644
--- a/audio/out/ao_oss.c
+++ b/audio/out/ao_oss.c
@@ -34,8 +34,8 @@
 #include <string.h>
 
 #include "config.h"
-#include "core/options.h"
-#include "core/mp_msg.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_msg.h"
 #include "audio/mixer.h"
 
 #ifdef HAVE_SYS_SOUNDCARD_H
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index 2b6a89e78b..207b75fddd 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -28,11 +28,11 @@
 
 #include "talloc.h"
 
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 #include "audio/format.h"
 #include "audio/reorder_ch.h"
 #include "ao.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #ifdef __MINGW32__
 // for GetFileType to detect pipes
diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c
index ea8d8f3e88..b80549398f 100644
--- a/audio/out/ao_portaudio.c
+++ b/audio/out/ao_portaudio.c
@@ -26,10 +26,10 @@
 #include <portaudio.h>
 
 #include "config.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 #include "audio/format.h"
-#include "core/mp_msg.h"
-#include "core/mp_ring.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_ring.h"
 #include "ao.h"
 
 struct priv {
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index 382a4d2dcc..0a7d5347ba 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -28,9 +28,9 @@
 
 #include "config.h"
 #include "audio/format.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "ao.h"
-#include "core/input/input.h"
+#include "mpvcore/input/input.h"
 
 #define PULSE_CLIENT_NAME "mpv"
 
diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c
index db89ad52c6..5bfdbcef0f 100644
--- a/audio/out/ao_rsound.c
+++ b/audio/out/ao_rsound.c
@@ -29,7 +29,7 @@
 
 #include "talloc.h"
 
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 #include "osdep/timer.h"
 #include "audio/format.h"
 #include "ao.h"
diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c
index b5368066d8..231b40681a 100644
--- a/audio/out/ao_sdl.c
+++ b/audio/out/ao_sdl.c
@@ -23,8 +23,8 @@
 #include "audio/format.h"
 #include "talloc.h"
 #include "ao.h"
-#include "core/mp_msg.h"
-#include "core/m_option.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
 #include "osdep/timer.h"
 
 #include <libavutil/fifo.h>
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index 03a733ce33..d5860ae3ea 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -28,11 +28,11 @@
 #include <avrt.h>
 
 #include "config.h"
-#include "core/m_option.h"
-#include "core/m_config.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/m_config.h"
 #include "audio/format.h"
-#include "core/mp_msg.h"
-#include "core/mp_ring.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_ring.h"
 #include "ao.h"
 
 #ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE