summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-09 01:06:43 +0100
committerwm4 <wm4@nowhere>2012-11-12 20:08:18 +0100
commit4873b32c5959c988af1769529ff72e3fd62fba82 (patch)
treee18fbd7eef54de6071969689aa5c31d6ea1f0963 /sub
parentd4bdd0473d6f43132257c9fb3848d829755167a3 (diff)
downloadmpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.bz2
mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.xz
Rename directories, move files (step 2 of 2)
Finish renaming directories and moving files. Adjust all include statements to make the previous commit compile. The two commits are separate, because git is bad at tracking renames and content changes at the same time. Also take this as an opportunity to remove the separation between "common" and "mplayer" sources in the Makefile. ("common" used to be shared between mplayer and mencoder.)
Diffstat (limited to 'sub')
-rw-r--r--sub/ass_mp.c6
-rw-r--r--sub/dec_sub.c4
-rw-r--r--sub/draw_bmp.c10
-rw-r--r--sub/find_sub.c7
-rw-r--r--sub/find_subfiles.c8
-rw-r--r--sub/img_convert.c7
-rw-r--r--sub/osd_libass.c4
-rw-r--r--sub/sd_ass.c8
-rw-r--r--sub/sd_lavc.c4
-rw-r--r--sub/spudec.c6
-rw-r--r--sub/sub.c9
-rw-r--r--sub/subassconvert.c4
-rw-r--r--sub/subreader.c6
-rw-r--r--sub/vobsub.c6
14 files changed, 43 insertions, 46 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index 1867880f38..503bd23188 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -30,13 +30,13 @@
#include <libavutil/common.h>
#include "config.h"
-#include "mp_msg.h"
-#include "path.h"
+#include "core/mp_msg.h"
+#include "core/path.h"
#include "ass_mp.h"
#include "subreader.h"
#include "sub/sub.h"
#include "stream/stream.h"
-#include "options.h"
+#include "core/options.h"
ASS_Track *mp_ass_default_track(ASS_Library *library, struct MPOpts *opts)
{
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index 5ceb3b2422..4e703e7dc0 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -21,11 +21,11 @@
#include <assert.h>
#include "config.h"
-#include "libmpdemux/stheader.h"
+#include "demux/stheader.h"
#include "sub/sd.h"
#include "sub/sub.h"
#include "sub/dec_sub.h"
-#include "options.h"
+#include "core/options.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 9a72a5b738..e578bd0fcf 100644
--- a/sub/draw_bmp.c
+++ b/sub/draw_bmp.c
@@ -24,13 +24,13 @@
#include <libavutil/common.h>
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "sub/draw_bmp.h"
#include "sub/sub.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/sws_utils.h"
-#include "libmpcodecs/img_format.h"
-#include "libvo/csputils.h"
+#include "video/mp_image.h"
+#include "video/sws_utils.h"
+#include "video/img_format.h"
+#include "video/csputils.h"
const bool mp_draw_sub_formats[SUBBITMAP_COUNT] = {
[SUBBITMAP_LIBASS] = true,
diff --git a/sub/find_sub.c b/sub/find_sub.c
index 97c232b1db..5feef2a3e9 100644
--- a/sub/find_sub.c
+++ b/sub/find_sub.c
@@ -22,13 +22,12 @@
#include <stdio.h>
-#include "libvo/video_out.h"
#include "sub.h"
#include "subreader.h"
-#include "mp_msg.h"
-#include "mpcommon.h"
-#include "mplayer.h"
+#include "core/mp_msg.h"
+#include "core/mp_common.h"
+#include "core/mplayer.h"
static int current_sub=0;
diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c
index 2e705bd4d1..502fc911dc 100644
--- a/sub/find_subfiles.c
+++ b/sub/find_subfiles.c
@@ -6,10 +6,10 @@
#include "osdep/io.h"
-#include "mp_msg.h"
-#include "options.h"
-#include "path.h"
-#include "mpcommon.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
+#include "core/path.h"
+#include "core/mp_common.h"
#include "sub/find_subfiles.h"
#include "sub/sub.h"
#include "sub/subreader.h"
diff --git a/sub/img_convert.c b/sub/img_convert.c
index aa5c89401a..e2eded24c3 100644
--- a/sub/img_convert.c
+++ b/sub/img_convert.c
@@ -25,10 +25,9 @@
#include "img_convert.h"
#include "sub.h"
-#include "spudec.h"
-#include "libmpcodecs/img_format.h"
-#include "libmpcodecs/mp_image.h"
-#include "libmpcodecs/sws_utils.h"
+#include "video/img_format.h"
+#include "video/mp_image.h"
+#include "video/sws_utils.h"
struct osd_conv_cache {
struct sub_bitmap part;
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 11173dad7a..8e7d766024 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "talloc.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "sub.h"
#include "libavutil/common.h"
@@ -32,7 +32,7 @@ static const char osd_font_pfb[] =
;
#include "sub/ass_mp.h"
-#include "mp_core.h"
+#include "core/mp_core.h"
// NOTE: \fs-5 to reduce the size of the symbols in relation to normal text.
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 8c0719658b..7473c25de1 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -23,10 +23,10 @@
#include "talloc.h"
-#include "options.h"
-#include "mpcommon.h"
-#include "mp_msg.h"
-#include "libmpdemux/stheader.h"
+#include "core/options.h"
+#include "core/mp_common.h"
+#include "core/mp_msg.h"
+#include "demux/stheader.h"
#include "sub.h"
#include "dec_sub.h"
#include "ass_mp.h"
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index bee224c506..fbffc175d4 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -21,8 +21,8 @@
#include <libavcodec/avcodec.h>
#include "talloc.h"
-#include "mp_msg.h"
-#include "libmpdemux/stheader.h"
+#include "core/mp_msg.h"
+#include "demux/stheader.h"
#include "sd.h"
#include "dec_sub.h"
#include "sub.h"
diff --git a/sub/spudec.c b/sub/spudec.c
index 003a068422..2a2bc2dde3 100644
--- a/sub/spudec.c
+++ b/sub/spudec.c
@@ -40,13 +40,13 @@
#include <libavutil/intreadwrite.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "spudec.h"
#include "vobsub.h"
#include "sub.h"
-#include "mpcommon.h"
-#include "libvo/csputils.h"
+#include "core/mp_common.h"
+#include "video/csputils.h"
typedef struct spu_packet_t packet_t;
struct spu_packet_t {
diff --git a/sub/sub.c b/sub/sub.c
index 517de35fc3..eafa2cc831 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -23,17 +23,16 @@
#include <libavutil/common.h>
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "stream/stream.h"
#include "osdep/timer.h"
#include "talloc.h"
-#include "options.h"
-#include "mplayer.h"
-#include "mp_msg.h"
-#include "libvo/video_out.h"
+#include "core/options.h"
+#include "core/mplayer.h"
+#include "core/mp_msg.h"
#include "sub.h"
#include "dec_sub.h"
#include "img_convert.h"
diff --git a/sub/subassconvert.c b/sub/subassconvert.c
index c391ad7c86..09ce94793c 100644
--- a/sub/subassconvert.c
+++ b/sub/subassconvert.c
@@ -25,9 +25,9 @@
#include <stdarg.h>
#include <stdbool.h>
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "subassconvert.h"
-#include "bstr.h"
+#include "core/bstr.h"
#include "libavutil/common.h"
struct line {
diff --git a/sub/subreader.c b/sub/subreader.c
index 1f88b220d1..583e719e55 100644
--- a/sub/subreader.c
+++ b/sub/subreader.c
@@ -28,11 +28,11 @@
#include <dirent.h>
#include "config.h"
-#include "mp_msg.h"
+#include "core/mp_msg.h"
#include "subreader.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "subassconvert.h"
-#include "options.h"
+#include "core/options.h"
#include "stream/stream.h"
#include "libavutil/common.h"
#include "libavutil/avstring.h"
diff --git a/sub/vobsub.c b/sub/vobsub.c
index ac2793062a..1643f249f0 100644
--- a/sub/vobsub.c
+++ b/sub/vobsub.c
@@ -32,11 +32,11 @@
#include <sys/types.h>
#include "config.h"
-#include "mpcommon.h"
+#include "core/mp_common.h"
#include "vobsub.h"
#include "spudec.h"
-#include "mp_msg.h"
-#include "path.h"
+#include "core/mp_msg.h"
+#include "core/path.h"
#include "libavutil/common.h"
extern int vobsub_id;