summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 02:39:45 +0100
committerwm4 <wm4@nowhere>2013-12-17 02:39:45 +0100
commit0112143fdaae0a6264d9e02355e9dc0ca4f7741c (patch)
treebbbe9527d1e1490e37b67d97398c5bc19c7794cd /sub
parent73a5417950a2d21a397597c05521725f3d125993 (diff)
downloadmpv-0112143fdaae0a6264d9e02355e9dc0ca4f7741c.tar.bz2
mpv-0112143fdaae0a6264d9e02355e9dc0ca4f7741c.tar.xz
Split mpvcore/ into common/, misc/, bstr/
Diffstat (limited to 'sub')
-rw-r--r--sub/ass_mp.c2
-rw-r--r--sub/dec_sub.c4
-rw-r--r--sub/draw_bmp.c2
-rw-r--r--sub/find_subfiles.c4
-rw-r--r--sub/osd.c4
-rw-r--r--sub/osd_libass.c4
-rw-r--r--sub/sd_ass.c4
-rw-r--r--sub/sd_lavc.c4
-rw-r--r--sub/sd_lavc_conv.c6
-rw-r--r--sub/sd_lavf_srt.c2
-rw-r--r--sub/sd_microdvd.c4
-rw-r--r--sub/sd_srt.c4
-rw-r--r--sub/spudec.c4
13 files changed, 24 insertions, 24 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index 75178d804d..cdf302f959 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -30,7 +30,7 @@
#include <libavutil/common.h>
#include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
#include "options/path.h"
#include "ass_mp.h"
#include "osd.h"
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index c5d45f81df..9a948cd036 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -27,8 +27,8 @@
#include "sd.h"
#include "dec_sub.h"
#include "options/options.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/charset_conv.h"
+#include "common/msg.h"
+#include "misc/charset_conv.h"
extern const struct sd_functions sd_ass;
extern const struct sd_functions sd_lavc;
diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c
index 2b91befe50..2e92bdaaa5 100644
--- a/sub/draw_bmp.c
+++ b/sub/draw_bmp.c
@@ -25,7 +25,7 @@
#include <libswscale/swscale.h>
#include <libavutil/common.h>
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
#include "draw_bmp.h"
#include "img_convert.h"
#include "video/mp_image.h"
diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c
index ce23bd50c4..d5f3078793 100644
--- a/sub/find_subfiles.c
+++ b/sub/find_subfiles.c
@@ -6,10 +6,10 @@
#include "osdep/io.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
#include "options/options.h"
#include "options/path.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
#include "sub/find_subfiles.h"
static const char *sub_exts[] = {"utf", "utf8", "utf-8", "idx", "sub", "srt",
diff --git a/sub/osd.c b/sub/osd.c
index 2432859782..ac2b40499a 100644
--- a/sub/osd.c
+++ b/sub/osd.c
@@ -23,7 +23,7 @@
#include <libavutil/common.h>
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
#include "stream/stream.h"
@@ -31,7 +31,7 @@
#include "talloc.h"
#include "options/options.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
#include "osd.h"
#include "dec_sub.h"
#include "img_convert.h"
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 16e90eea1e..3e6efe6667 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -25,8 +25,8 @@
#include "config.h"
#include "talloc.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/mp_msg.h"
+#include "common/common.h"
+#include "common/msg.h"
#include "osd.h"
static const char osd_font_pfb[] =
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index a8d5be633d..93a3c7e380 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -26,8 +26,8 @@
#include "talloc.h"
#include "options/options.h"
-#include "mpvcore/mp_common.h"
-#include "mpvcore/mp_msg.h"
+#include "common/common.h"
+#include "common/msg.h"
#include "video/csputils.h"
#include "video/mp_image.h"
#include "dec_sub.h"
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index 0e7121a279..1977ca3fff 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -22,8 +22,8 @@
#include <libavutil/common.h>
#include "talloc.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/av_common.h"
+#include "common/msg.h"
+#include "common/av_common.h"
#include "options/options.h"
#include "video/mp_image.h"
#include "sd.h"
diff --git a/sub/sd_lavc_conv.c b/sub/sd_lavc_conv.c
index 24ea2c10c6..0fa3986e3d 100644
--- a/sub/sd_lavc_conv.c
+++ b/sub/sd_lavc_conv.c
@@ -25,9 +25,9 @@
#include "config.h"
#include "talloc.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/av_common.h"
-#include "mpvcore/bstr.h"
+#include "common/msg.h"
+#include "common/av_common.h"
+#include "bstr/bstr.h"
#include "sd.h"
#if LIBAVCODEC_VERSION_MICRO >= 100
diff --git a/sub/sd_lavf_srt.c b/sub/sd_lavf_srt.c
index 3e2ebefab2..0a48afa990 100644
--- a/sub/sd_lavf_srt.c
+++ b/sub/sd_lavf_srt.c
@@ -21,7 +21,7 @@
#include <inttypes.h>
#include <assert.h>
-#include "mpvcore/bstr.h"
+#include "bstr/bstr.h"
#include "sd.h"
/*
diff --git a/sub/sd_microdvd.c b/sub/sd_microdvd.c
index c0e9fa1d61..e9c7a788bc 100644
--- a/sub/sd_microdvd.c
+++ b/sub/sd_microdvd.c
@@ -27,8 +27,8 @@
#include <ctype.h>
#include <libavutil/common.h>
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/bstr.h"
+#include "common/msg.h"
+#include "bstr/bstr.h"
#include "sd.h"
struct line {
diff --git a/sub/sd_srt.c b/sub/sd_srt.c
index 343f218190..c08f927c4a 100644
--- a/sub/sd_srt.c
+++ b/sub/sd_srt.c
@@ -27,8 +27,8 @@
#include <ctype.h>
#include <libavutil/common.h>
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/bstr.h"
+#include "common/msg.h"
+#include "bstr/bstr.h"
#include "sd.h"
struct line {
diff --git a/sub/spudec.c b/sub/spudec.c
index 5a2c094be9..79b0b2eb93 100644
--- a/sub/spudec.c
+++ b/sub/spudec.c
@@ -40,11 +40,11 @@
#include <libavutil/intreadwrite.h>
#include "config.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
#include "spudec.h"
#include "osd.h"
-#include "mpvcore/mp_common.h"
+#include "common/common.h"
#include "video/csputils.h"
typedef struct spu_packet_t packet_t;