diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-26 19:40:52 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-26 20:39:05 +0200 |
commit | c9026cb3210205b07e2e068467a18ee40f9259a3 (patch) | |
tree | ea9657ad306899c6fbedae4abd088e9ac44fa61f /libmpdemux | |
parent | ebd2058d033416274f2e4b40f5ad907d86f8aad5 (diff) | |
download | mpv-c9026cb3210205b07e2e068467a18ee40f9259a3.tar.bz2 mpv-c9026cb3210205b07e2e068467a18ee40f9259a3.tar.xz |
sub/OSD: move some related files to sub/
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_lavf.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_mkv.c | 6 | ||||
-rw-r--r-- | libmpdemux/demux_mov.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ogg.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_ty.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ty_osd.c | 4 | ||||
-rw-r--r-- | libmpdemux/video.c | 2 |
7 files changed, 9 insertions, 13 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index c84a17e4e3..904cd1434b 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -36,7 +36,7 @@ #include "demuxer.h" #include "stheader.h" #include "m_option.h" -#include "libvo/sub.h" +#include "sub/sub.h" #include "libavformat/avformat.h" #include "libavformat/avio.h" diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 499c664360..7432b59d46 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -41,11 +41,7 @@ #include "mp_msg.h" -#include "vobsub.h" -#include "subreader.h" -#include "libvo/sub.h" - -#include "ass_mp.h" +#include "sub/sub.h" #include "libavutil/common.h" diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 3175ae34bd..5ecb076698 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -64,7 +64,7 @@ #include "libavutil/common.h" #include "ffmpeg_files/intreadwrite.h" -#include "libvo/sub.h" +#include "sub/sub.h" #include "demux_mov.h" #include "qtpalette.h" diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 1883c36cd1..3ba2627414 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -166,8 +166,8 @@ typedef struct ogg_demuxer { //-------- subtitle support - should be moved to decoder layer, and queue // - subtitles up in demuxer buffer... -#include "subreader.h" -#include "libvo/sub.h" +#include "sub/subreader.h" +#include "sub/sub.h" #define OGG_SUB_MAX_LINE 128 static subtitle ogg_sub; diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 3120404d49..df4c6c34fd 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -44,7 +44,7 @@ #include "demux_ty_osd.h" #include "parse_es.h" #include "stheader.h" -#include "sub_cc.h" +#include "sub/sub_cc.h" #include "libavutil/avstring.h" #include "ffmpeg_files/intreadwrite.h" diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c index 0d419b0813..983c243f98 100644 --- a/libmpdemux/demux_ty_osd.c +++ b/libmpdemux/demux_ty_osd.c @@ -23,8 +23,8 @@ //#include "stheader.h" //#include "mp3_hdr.h" //#include "subreader.h" -#include "sub_cc.h" -#include "libvo/sub.h" +#include "sub/sub_cc.h" +#include "sub/sub.h" #include "demux_ty_osd.h" //#include "dvdauth.h" diff --git a/libmpdemux/video.c b/libmpdemux/video.c index bda6e661ae..400a995d57 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -38,7 +38,7 @@ #include "mpeg_hdr.h" /* sub_cc (closed captions)*/ -#include "sub_cc.h" +#include "sub/sub_cc.h" /* biCompression constant */ #define BI_RGB 0L |