summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-26 19:40:52 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-26 20:39:05 +0200
commitc9026cb3210205b07e2e068467a18ee40f9259a3 (patch)
treeea9657ad306899c6fbedae4abd088e9ac44fa61f /mplayer.c
parentebd2058d033416274f2e4b40f5ad907d86f8aad5 (diff)
downloadmpv-c9026cb3210205b07e2e068467a18ee40f9259a3.tar.bz2
mpv-c9026cb3210205b07e2e068467a18ee40f9259a3.tar.xz
sub/OSD: move some related files to sub/
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/mplayer.c b/mplayer.c
index 1d8b74892c..5618bd4777 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -71,16 +71,16 @@
#include "libavutil/avstring.h"
-#include "subreader.h"
+#include "sub/subreader.h"
#include "sub/dec_sub.h"
#include "mp_osd.h"
#include "libvo/video_out.h"
-#include "libvo/font_load.h"
-#include "libvo/sub.h"
+#include "sub/font_load.h"
+#include "sub/sub.h"
#include "ffmpeg_files/intreadwrite.h"
-#include "av_sub.h"
+#include "sub/av_sub.h"
#include "libmpcodecs/dec_teletext.h"
#include "cpudetect.h"
#include "version.h"
@@ -95,8 +95,8 @@
#include "edl.h"
-#include "spudec.h"
-#include "vobsub.h"
+#include "sub/spudec.h"
+#include "sub/vobsub.h"
#include "osdep/getch2.h"
#include "osdep/timer.h"
@@ -335,7 +335,7 @@ char *vobsub_name=NULL;
int subcc_enabled=0;
int suboverlap_enabled = 1;
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
char* current_module=NULL; // for debugging