summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-21 00:26:05 +0200
committerwm4 <wm4@nowhere>2013-06-25 00:11:54 +0200
commitdb2e1ef4d210f5a8a4a2555d0a78b0a4dea103ec (patch)
tree7ee58c2d174019feb7957daaf430bb431c05cba0
parent2cd53d449abacde3e461c0daa15617aca4450eea (diff)
downloadmpv-db2e1ef4d210f5a8a4a2555d0a78b0a4dea103ec.tar.bz2
mpv-db2e1ef4d210f5a8a4a2555d0a78b0a4dea103ec.tar.xz
Move/rename subreader.c
-rw-r--r--Makefile2
-rw-r--r--core/mplayer.c2
-rw-r--r--demux/demux_subreader.c (renamed from sub/subreader.c)0
-rw-r--r--demux/subreader.h (renamed from sub/subreader.h)0
-rw-r--r--sub/ass_mp.c1
-rw-r--r--sub/ass_mp.h1
-rw-r--r--sub/dec_sub.c2
-rw-r--r--sub/sub.c1
8 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 9ac246dc36..4e244d8489 100644
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,7 @@ SOURCES = talloc.c \
demux/demux_mkv.c \
demux/demux_mpg.c \
demux/demux_sub.c \
+ demux/demux_subreader.c \
demux/demux_ts.c \
demux/mp3_hdr.c \
demux/parse_es.c \
@@ -240,7 +241,6 @@ SOURCES = talloc.c \
sub/sd_srt.c \
sub/spudec.c \
sub/sub.c \
- sub/subreader.c \
video/csputils.c \
video/fmt-conversion.c \
video/image_writer.c \
diff --git a/core/mplayer.c b/core/mplayer.c
index 3f65573bb5..e0049a8bd0 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -71,7 +71,7 @@
#include "core/mplayer.h"
#include "core/m_property.h"
-#include "sub/subreader.h"
+#include "demux/subreader.h"
#include "sub/find_subfiles.h"
#include "sub/dec_sub.h"
#include "sub/sd.h"
diff --git a/sub/subreader.c b/demux/demux_subreader.c
index befac689a4..befac689a4 100644
--- a/sub/subreader.c
+++ b/demux/demux_subreader.c
diff --git a/sub/subreader.h b/demux/subreader.h
index 3b2e53efd8..3b2e53efd8 100644
--- a/sub/subreader.h
+++ b/demux/subreader.h
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index 0efbdd9c90..48a713f6ee 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -33,7 +33,6 @@
#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 "core/options.h"
diff --git a/sub/ass_mp.h b/sub/ass_mp.h
index 9f40b34166..dbdc95f031 100644
--- a/sub/ass_mp.h
+++ b/sub/ass_mp.h
@@ -25,7 +25,6 @@
#include <stdbool.h>
#include "config.h"
-#include "subreader.h"
// This is probably arbitrary.
// sd_lavc_conv might indirectly still assume this PlayResY, though.
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index 230dfa2f55..bfd6d90d03 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -25,7 +25,7 @@
#include "sd.h"
#include "sub.h"
#include "dec_sub.h"
-#include "subreader.h"
+#include "demux/subreader.h"
#include "core/options.h"
#include "core/mp_msg.h"
diff --git a/sub/sub.c b/sub/sub.c
index a0965dc1ec..7eb32d5885 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -37,7 +37,6 @@
#include "dec_sub.h"
#include "img_convert.h"
#include "draw_bmp.h"
-#include "subreader.h"
#include "video/mp_image.h"
#include "video/mp_image_pool.h"