Split mpvcore/ into common/, misc/, bstr/

14 files changed, 24 insertions, 24 deletions

diff --git a/demux/codec_tags.c b/demux/codec_tags.c
index e63f1e7134..299249a2cf 100644
--- a/demux/codec_tags.c
+++ b/demux/codec_tags.c
@@ -20,7 +20,7 @@
 #include <libavutil/common.h>
 #include "codec_tags.h"
 #include "stheader.h"
-#include "mpvcore/av_common.h"
+#include "common/av_common.h"
 
 /* The following tables map FourCCs to codec names (as defined by libavcodec).
  * However, this includes only names that are not defined by libavformat's
diff --git a/demux/demux.c b/demux/demux.c
index 626804fcef..c5cbe392af 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -30,9 +30,9 @@
 
 #include "config.h"
 #include "options/options.h"
-#include "mpvcore/av_common.h"
+#include "common/av_common.h"
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux.h b/demux/demux.h
index 6b08b84e4c..6d5253786f 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -25,8 +25,8 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "mpvcore/bstr.h"
-#include "mpvcore/mp_common.h"
+#include "bstr/bstr.h"
+#include "common/common.h"
 #include "packet.h"
 #include "stheader.h"
 
diff --git a/demux/demux_cue.c b/demux/demux_cue.c
index 7c94850899..bfca04dcad 100644
--- a/demux/demux_cue.c
+++ b/demux/demux_cue.c
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "demux.h"
 #include "stream/stream.h"
 
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index c541f345e1..9057284c1e 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -36,10 +36,10 @@
 
 #include "config.h"
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/av_opts.h"
-#include "mpvcore/av_common.h"
-#include "mpvcore/bstr.h"
+#include "common/msg.h"
+#include "common/av_opts.h"
+#include "common/av_common.h"
+#include "bstr/bstr.h"
 
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux_libass.c b/demux/demux_libass.c
index 15e149212b..f01b999d9e 100644
--- a/demux/demux_libass.c
+++ b/demux/demux_libass.c
@@ -22,8 +22,8 @@
 #include <ass/ass_types.h>
 
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/charset_conv.h"
+#include "common/msg.h"
+#include "misc/charset_conv.h"
 #include "stream/stream.h"
 #include "demux.h"
 
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 1eea59a058..876b17a025 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -27,7 +27,7 @@
 
 #include "talloc.h"
 #include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index b3cf253be5..52ab592eb0 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -43,7 +43,7 @@
 
 #include "talloc.h"
 #include "options/options.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 #include "stream/stream.h"
 #include "demux.h"
 #include "stheader.h"
@@ -51,7 +51,7 @@
 #include "matroska.h"
 #include "codec_tags.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 static const unsigned char sipr_swaps[38][2] = {
     {0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68},
diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c
index 1a4882f92b..38011f80b7 100644
--- a/demux/demux_playlist.c
+++ b/demux/demux_playlist.c
@@ -15,10 +15,10 @@
  * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "options/options.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/playlist.h"
+#include "common/msg.h"
+#include "common/playlist.h"
 #include "options/path.h"
 #include "stream/stream.h"
 #include "demux.h"
diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index a3cee1794b..e2b4c1cac4 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -32,8 +32,8 @@
 #include <libavutil/avstring.h>
 
 #include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/mp_common.h"
+#include "common/msg.h"
+#include "common/common.h"
 #include "options/options.h"
 #include "stream/stream.h"
 #include "demux/demux.h"
diff --git a/demux/ebml.c b/demux/ebml.c
index 06ef85b742..dabdebb9ea 100644
--- a/demux/ebml.c
+++ b/demux/ebml.c
@@ -35,7 +35,7 @@
 #include "ebml.h"
 #include "stream/stream.h"
 #include "compat/mpbswap.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 #ifndef SIZE_MAX
 #define SIZE_MAX ((size_t)-1)
diff --git a/demux/ebml.h b/demux/ebml.h
index 715e9ff85d..8652746e48 100644
--- a/demux/ebml.h
+++ b/demux/ebml.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 
 #include "stream/stream.h"
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
 
 
 /* EBML version supported */
diff --git a/demux/mf.c b/demux/mf.c
index e50e10b43c..02a576c51d 100644
--- a/demux/mf.c
+++ b/demux/mf.c
@@ -37,7 +37,7 @@
 #endif
 
 #include "talloc.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 #include "stream/stream.h"
 #include "options/path.h"
 
diff --git a/demux/stheader.h b/demux/stheader.h
index 92bb404b6d..25f60ba032 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
 #include "audio/chmap.h"
 #include "ms_hdr.h"
 struct MPOpts;