summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile28
-rw-r--r--TOOLS/subrip.c4
-rw-r--r--command.c10
-rw-r--r--libmenu/menu.c4
-rw-r--r--libmenu/menu_cmdlist.c2
-rw-r--r--libmenu/menu_console.c2
-rw-r--r--libmenu/menu_list.c2
-rw-r--r--libmenu/menu_txt.c2
-rw-r--r--libmenu/vf_menu.c4
-rw-r--r--libmpcodecs/vf_ass.c4
-rw-r--r--libmpcodecs/vf_expand.c2
-rw-r--r--libmpcodecs/vf_vo.c4
-rw-r--r--libmpdemux/demux_lavf.c2
-rw-r--r--libmpdemux/demux_mkv.c6
-rw-r--r--libmpdemux/demux_mov.c2
-rw-r--r--libmpdemux/demux_ogg.c4
-rw-r--r--libmpdemux/demux_ty.c2
-rw-r--r--libmpdemux/demux_ty_osd.c4
-rw-r--r--libmpdemux/video.c2
-rw-r--r--libvo/old_vo_wrapper.c2
-rw-r--r--libvo/vesa_lvo.c2
-rw-r--r--libvo/vo_aa.c4
-rw-r--r--libvo/vo_caca.c2
-rw-r--r--libvo/vo_corevideo.m2
-rw-r--r--libvo/vo_dfbmga.c2
-rw-r--r--libvo/vo_dga.c2
-rw-r--r--libvo/vo_direct3d.c4
-rw-r--r--libvo/vo_directfb2.c2
-rw-r--r--libvo/vo_directx.c2
-rw-r--r--libvo/vo_dxr2.c2
-rw-r--r--libvo/vo_dxr3.c2
-rw-r--r--libvo/vo_fbdev.c2
-rw-r--r--libvo/vo_fbdev2.c2
-rw-r--r--libvo/vo_gl.c6
-rw-r--r--libvo/vo_gl2.c2
-rw-r--r--libvo/vo_kva.c2
-rw-r--r--libvo/vo_mga.c2
-rw-r--r--libvo/vo_quartz.c2
-rw-r--r--libvo/vo_s3fb.c2
-rw-r--r--libvo/vo_sdl.c2
-rw-r--r--libvo/vo_svga.c2
-rw-r--r--libvo/vo_tdfxfb.c2
-rw-r--r--libvo/vo_vdpau.c6
-rw-r--r--libvo/vo_vesa.c2
-rw-r--r--libvo/vo_wii.c2
-rw-r--r--libvo/vo_x11.c2
-rw-r--r--libvo/vo_xmga.c2
-rw-r--r--libvo/vo_xv.c2
-rw-r--r--libvo/vo_xvmc.c2
-rw-r--r--libvo/vo_xvr100.c2
-rw-r--r--libvo/vo_yuv4mpeg.c2
-rw-r--r--libvo/vosub_vidix.c2
-rw-r--r--mp_core.h2
-rw-r--r--mplayer.c14
-rw-r--r--stream/stream_dvdnav.c2
-rw-r--r--sub/ass_mp.c (renamed from ass_mp.c)0
-rw-r--r--sub/ass_mp.h (renamed from ass_mp.h)0
-rw-r--r--sub/av_sub.c (renamed from av_sub.c)2
-rw-r--r--sub/av_sub.h (renamed from av_sub.h)0
-rw-r--r--sub/find_sub.c (renamed from find_sub.c)2
-rw-r--r--sub/font_load.c (renamed from libvo/font_load.c)0
-rw-r--r--sub/font_load.h (renamed from libvo/font_load.h)0
-rw-r--r--sub/font_load_ft.c (renamed from libvo/font_load_ft.c)0
-rw-r--r--sub/osd_font.h (renamed from libvo/osd_font.h)0
-rw-r--r--sub/sd_ass.c2
-rw-r--r--sub/spudec.c (renamed from spudec.c)0
-rw-r--r--sub/spudec.h (renamed from spudec.h)0
-rw-r--r--sub/sub.c (renamed from libvo/sub.c)2
-rw-r--r--sub/sub.h (renamed from libvo/sub.h)0
-rw-r--r--sub/sub_cc.c (renamed from sub_cc.c)2
-rw-r--r--sub/sub_cc.h (renamed from sub_cc.h)0
-rw-r--r--sub/subreader.c (renamed from subreader.c)2
-rw-r--r--sub/subreader.h (renamed from subreader.h)0
-rw-r--r--sub/unrar_exec.c (renamed from unrar_exec.c)0
-rw-r--r--sub/unrar_exec.h (renamed from unrar_exec.h)0
-rw-r--r--sub/vobsub.c (renamed from vobsub.c)0
-rw-r--r--sub/vobsub.h (renamed from vobsub.h)0
77 files changed, 97 insertions, 101 deletions
diff --git a/Makefile b/Makefile
index 15bbfbc31c..40f3251419 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c
SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c
SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
-SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c
+SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c
SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \
stream/cdinfo.c
SRCS_COMMON-$(CDDB) += stream/stream_cddb.c
@@ -101,7 +101,6 @@ SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c
SRCS_COMMON-$(FFMPEG) += libmpcodecs/vf_pp.c \
av_opts.c \
libaf/af_lavcac3enc.c \
- av_sub.c \
libaf/af_lavcresample.c \
libmpcodecs/ad_ffmpeg.c \
libmpcodecs/vd_ffmpeg.c \
@@ -111,6 +110,7 @@ SRCS_COMMON-$(FFMPEG) += libmpcodecs/vf_pp.c \
libmpcodecs/vf_uspp.c \
libmpdemux/demux_lavf.c \
stream/stream_ffmpeg.c \
+ sub/av_sub.c \
# Requires a new enough libavutil that installs eval.h
SRCS_COMMON-$(FFMPEG_EVAL_API) += libmpcodecs/vf_geq.c \
@@ -122,7 +122,7 @@ SRCS_COMMON-$(FFMPEG_INTERNALS) += libmpcodecs/vf_fspp.c \
libmpcodecs/vf_qp.c \
libmpcodecs/vf_spp.c \
-SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c
+SRCS_COMMON-$(FREETYPE) += sub/font_load_ft.c
SRCS_COMMON-$(FTP) += stream/stream_ftp.c
SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c
SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c
@@ -130,8 +130,8 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c
SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c
SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c
-SRCS_COMMON-$(LIBASS) += ass_mp.c \
- libmpcodecs/vf_ass.c \
+SRCS_COMMON-$(LIBASS) += libmpcodecs/vf_ass.c \
+ sub/ass_mp.c \
sub/sd_ass.c \
SRCS_COMMON-$(LIBBLURAY) += stream/stream_bluray.c
@@ -269,7 +269,7 @@ SRCS_COMMON-$(TV_DSHOW) += stream/tvi_dshow.c \
SRCS_COMMON-$(TV_V4L1) += stream/tvi_v4l.c stream/audio_in.c
SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c
-SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c
+SRCS_COMMON-$(UNRAR_EXEC) += sub/unrar_exec.c
SRCS_COMMON-$(VCD) += stream/stream_vcd.c
SRCS_COMMON-$(VORBIS) += libmpcodecs/ad_libvorbis.c \
libmpdemux/demux_ogg.c
@@ -328,7 +328,6 @@ SRCS_COMMON = asxparser.c \
cpudetect.c \
defaultopts.c \
edl.c \
- find_sub.c \
fmt-conversion.c \
m_config.c \
m_option.c \
@@ -339,12 +338,8 @@ SRCS_COMMON = asxparser.c \
path.c \
playtree.c \
playtreeparser.c \
- spudec.c \
- sub_cc.c \
subopt-helper.c \
- subreader.c \
talloc.c \
- vobsub.c \
libaf/af.c \
libaf/af_center.c \
libaf/af_channels.c \
@@ -504,7 +499,6 @@ SRCS_COMMON = asxparser.c \
libmpdemux/yuv4mpeg.c \
libmpdemux/yuv4mpeg_ratio.c \
libvo/osd.c \
- libvo/sub.c \
osdep/findfiles.c \
osdep/numcores.c \
osdep/$(GETCH) \
@@ -516,8 +510,14 @@ SRCS_COMMON = asxparser.c \
stream/stream_mf.c \
stream/stream_null.c \
stream/url.c \
+ sub/sub.c \
+ sub/sub_cc.c \
sub/dec_sub.c \
+ sub/find_sub.c \
+ sub/spudec.c \
sub/subassconvert.c \
+ sub/subreader.c \
+ sub/vobsub.c \
$(SRCS_COMMON-yes)
@@ -917,8 +917,8 @@ toolsclean:
TOOLS/bmovl-test$(EXESUF): -lSDL_image
-TOOLS/subrip$(EXESUF): vobsub.o spudec.o unrar_exec.o libvo/aclib.o \
- libswscale/libswscale.a libavutil/libavutil.a $(TEST_OBJS)
+TOOLS/subrip$(EXESUF): sub/vobsub.o sub/spudec.o sub/unrar_exec.o \
+ libvo/aclib.o \ libswscale/libswscale.a libavutil/libavutil.a $(TEST_OBJS)
TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32
diff --git a/TOOLS/subrip.c b/TOOLS/subrip.c
index 85ee1c78e0..fb9395c413 100644
--- a/TOOLS/subrip.c
+++ b/TOOLS/subrip.c
@@ -31,8 +31,8 @@
#include <sys/types.h>
#include <sys/wait.h>
#include "libvo/video_out.h"
-#include "vobsub.h"
-#include "spudec.h"
+#include "sub/vobsub.h"
+#include "sub/spudec.h"
/* linking hacks */
char *mplayer_version;
diff --git a/command.c b/command.c
index 0cb5c35f15..c00112114e 100644
--- a/command.c
+++ b/command.c
@@ -31,7 +31,7 @@
#include "libmpdemux/stheader.h"
#include "codec-cfg.h"
#include "mplayer.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
#include "sub/dec_sub.h"
#include "m_option.h"
#include "m_property.h"
@@ -41,7 +41,7 @@
#include "libmpcodecs/vd.h"
#include "mp_osd.h"
#include "libvo/video_out.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "playtree.h"
#include "libao2/audio_out.h"
#include "mpcommon.h"
@@ -49,10 +49,10 @@
#include "libmpcodecs/dec_video.h"
#include "libmpcodecs/dec_audio.h"
#include "libmpcodecs/dec_teletext.h"
-#include "vobsub.h"
-#include "spudec.h"
+#include "sub/vobsub.h"
+#include "sub/spudec.h"
#include "path.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "stream/tv.h"
#include "stream/stream_radio.h"
#include "stream/pvr.h"
diff --git a/libmenu/menu.c b/libmenu/menu.c
index 8a9cb28872..f537cd1671 100644
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@@ -26,8 +26,8 @@
#include <unistd.h>
#include "libvo/osd.h"
-#include "libvo/font_load.h"
-#include "libvo/sub.h"
+#include "sub/font_load.h"
+#include "sub/sub.h"
#include "osdep/keycodes.h"
#include "asxparser.h"
#include "stream/stream.h"
diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c
index 5b7812be5e..14026d04c4 100644
--- a/libmenu/menu_cmdlist.c
+++ b/libmenu/menu_cmdlist.c
@@ -33,7 +33,7 @@
#include "menu.h"
#include "menu_list.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "input/input.h"
diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c
index dd706b65cb..eb8595e9ab 100644
--- a/libmenu/menu_console.c
+++ b/libmenu/menu_console.c
@@ -38,7 +38,7 @@
#include "m_option.h"
#include "menu.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "osdep/keycodes.h"
#include "input/input.h"
#include "osdep/timer.h"
diff --git a/libmenu/menu_list.c b/libmenu/menu_list.c
index 28264ce04c..37f10d123e 100644
--- a/libmenu/menu_list.c
+++ b/libmenu/menu_list.c
@@ -29,7 +29,7 @@
#include "m_struct.h"
#include "menu.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "osdep/keycodes.h"
#define IMPL 1
diff --git a/libmenu/menu_txt.c b/libmenu/menu_txt.c
index 308d9547c0..0170320884 100644
--- a/libmenu/menu_txt.c
+++ b/libmenu/menu_txt.c
@@ -30,7 +30,7 @@
#include "m_option.h"
#include "menu.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "osdep/keycodes.h"
struct menu_priv_s {
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index 1a5d003e94..994c7134ea 100644
--- a/libmenu/vf_menu.c
+++ b/libmenu/vf_menu.c
@@ -32,8 +32,8 @@
#include "libvo/fastmemcpy.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 "input/input.h"
#include "m_struct.h"
#include "menu.h"
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index 39e5d8f3c5..4047316a50 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -33,14 +33,14 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
#include "libvo/fastmemcpy.h"
#include "m_option.h"
#include "m_struct.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#define _r(c) ((c)>>24)
#define _g(c) (((c)>>16)&0xFF)
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index 57226acb93..95580b9f26 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -35,7 +35,7 @@
#include "libavutil/avutil.h"
#ifdef OSD_SUPPORT
-#include "libvo/sub.h"
+#include "sub/sub.h"
#include "libvo/osd.h"
#endif
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index 4d94569ef3..8bbaf465b3 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -29,8 +29,8 @@
#include "libvo/video_out.h"
-#include "ass_mp.h"
-#include "libvo/sub.h"
+#include "sub/ass_mp.h"
+#include "sub/sub.h"
//===========================================================================//
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
diff --git a/libvo/old_vo_wrapper.c b/libvo/old_vo_wrapper.c
index bdbc8b8349..a99511d831 100644
--- a/libvo/old_vo_wrapper.c
+++ b/libvo/old_vo_wrapper.c
@@ -20,7 +20,7 @@
#include <stdint.h>
#include "old_vo_wrapper.h"
#include "video_out.h"
-#include "sub.h"
+#include "sub/sub.h"
struct vo *global_vo;
struct osd_state *global_osd;
diff --git a/libvo/vesa_lvo.c b/libvo/vesa_lvo.c
index 4f4c796250..f5cbab4757 100644
--- a/libvo/vesa_lvo.c
+++ b/libvo/vesa_lvo.c
@@ -39,7 +39,7 @@
#include "fastmemcpy.h"
#include "osd.h"
#include "video_out.h"
-#include "sub.h"
+#include "sub/sub.h"
#include "libmpcodecs/vfcap.h"
#define WIDTH_ALIGN 32 /* should be 16 for rage:422 and 32 for rage:420 */
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index 3e55803982..99e313d399 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -39,8 +39,8 @@
#include "aspect.h"
#include "libswscale/swscale.h"
#include "libmpcodecs/vf_scale.h"
-#include "font_load.h"
-#include "sub.h"
+#include "sub/font_load.h"
+#include "sub/sub.h"
#include "osdep/keycodes.h"
#include <aalib.h>
diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c
index 75e862ef91..2a5ebad4e7 100644
--- a/libvo/vo_caca.c
+++ b/libvo/vo_caca.c
@@ -35,7 +35,7 @@
#include "config.h"
#include "video_out.h"
#include "video_out_internal.h"
-#include "sub.h"
+#include "sub/sub.h"
#include "osdep/keycodes.h"
#include "mp_msg.h"
diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m
index 585898a076..a964de7e57 100644
--- a/libvo/vo_corevideo.m
+++ b/libvo/vo_corevideo.m
@@ -40,7 +40,7 @@
#include "mp_msg.h"
#include "m_option.h"
#include "mp_fifo.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
#include "subopt-helper.h"
#include "input/input.h"
diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c
index a0a9d07760..b83f3c5e52 100644
--- a/libvo/vo_dfbmga.c
+++ b/libvo/vo_dfbmga.c
@@ -31,7 +31,7 @@
#include "video_out.h"
#include "video_out_internal.h"
#include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
#include "mp_msg.h"
#include "aspect.h"
#include "mp_fifo.h"
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index 879831761d..94d42774a8 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -333,7 +333,7 @@ static void check_events(void)
//---------------------------------------------------------
-#include "sub.h"
+#include "sub/sub.h"
static void draw_osd(void)
{
diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c
index 384dcb477b..65f5a6c2d1 100644
--- a/libvo/vo_direct3d.c
+++ b/libvo/vo_direct3d.c
@@ -30,8 +30,8 @@
#include "aspect.h"
#include "w32_common.h"
#include "libavutil/common.h"
-#include "font_load.h"
-#include "sub.h"
+#include "sub/font_load.h"<