summaryrefslogtreecommitdiffstats
path: root/mpvcore/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-24 12:58:06 +0100
committerwm4 <wm4@nowhere>2013-11-24 14:44:58 +0100
commite5311586ab7641e0e1936473594bd9fbaa67bb2d (patch)
tree9d52ad39bb326e401b3ea368513c65a96ffb057a /mpvcore/player
parentdf8d00cc1fec3758e990d2e51e9830c43642e2b6 (diff)
downloadmpv-e5311586ab7641e0e1936473594bd9fbaa67bb2d.tar.bz2
mpv-e5311586ab7641e0e1936473594bd9fbaa67bb2d.tar.xz
Rename sub.c/.h to osd.c/.h
This was way too misleading. osd.c merely calls the subtitle renderers, instead of actually dealing with subtitles.
Diffstat (limited to 'mpvcore/player')
-rw-r--r--mpvcore/player/command.c2
-rw-r--r--mpvcore/player/main.c2
-rw-r--r--mpvcore/player/mp_lua.c2
-rw-r--r--mpvcore/player/osd.c2
-rw-r--r--mpvcore/player/playloop.c2
-rw-r--r--mpvcore/player/screenshot.c2
-rw-r--r--mpvcore/player/video.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/mpvcore/player/command.c b/mpvcore/player/command.c
index c2433106ac..884a9244b0 100644
--- a/mpvcore/player/command.c
+++ b/mpvcore/player/command.c
@@ -38,7 +38,7 @@
#include "mpvcore/resolve.h"
#include "mpvcore/playlist.h"
#include "mpvcore/playlist_parser.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
#include "sub/dec_sub.h"
#include "mpvcore/m_option.h"
#include "mpvcore/m_property.h"
diff --git a/mpvcore/player/main.c b/mpvcore/player/main.c
index 1e56cf3084..c1c25bce27 100644
--- a/mpvcore/player/main.c
+++ b/mpvcore/player/main.c
@@ -56,7 +56,7 @@
#include "demux/demux.h"
#include "stream/stream.h"
#include "sub/ass_mp.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
#include "video/decode/dec_video.h"
#include "video/out/vo.h"
diff --git a/mpvcore/player/mp_lua.c b/mpvcore/player/mp_lua.c
index 4b5512c926..03e21bf535 100644
--- a/mpvcore/player/mp_lua.c
+++ b/mpvcore/player/mp_lua.c
@@ -15,7 +15,7 @@
#include "mpvcore/path.h"
#include "mpvcore/bstr.h"
#include "osdep/timer.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
#include "mp_core.h"
#include "command.h"
#include "mp_lua.h"
diff --git a/mpvcore/player/osd.c b/mpvcore/player/osd.c
index afb04c837a..1674fcab8b 100644
--- a/mpvcore/player/osd.c
+++ b/mpvcore/player/osd.c
@@ -36,7 +36,7 @@
#include "osdep/timer.h"
#include "demux/demux.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
#include "mp_core.h"
#include "command.h"
diff --git a/mpvcore/player/playloop.c b/mpvcore/player/playloop.c
index 591d31fbca..ad32371699 100644
--- a/mpvcore/player/playloop.c
+++ b/mpvcore/player/playloop.c
@@ -41,7 +41,7 @@
#include "audio/out/ao.h"
#include "demux/demux.h"
#include "stream/stream.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
#include "video/filter/vf.h"
#include "video/decode/dec_video.h"
#include "video/out/vo.h"
diff --git a/mpvcore/player/screenshot.c b/mpvcore/player/screenshot.c
index f564b5e9d7..47f76f2a1e 100644
--- a/mpvcore/player/screenshot.c
+++ b/mpvcore/player/screenshot.c
@@ -36,7 +36,7 @@
#include "video/filter/vf.h"
#include "video/out/vo.h"
#include "video/image_writer.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
#include "video/csputils.h"
diff --git a/mpvcore/player/video.c b/mpvcore/player/video.c
index 7b3a236265..5ba9d5624b 100644
--- a/mpvcore/player/video.c
+++ b/mpvcore/player/video.c
@@ -34,7 +34,7 @@
#include "audio/out/ao.h"
#include "demux/demux.h"
#include "stream/stream.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
#include "video/hwdec.h"
#include "video/filter/vf.h"
#include "video/decode/dec_video.h"