[MPlayer-cvslog] r32554 - in trunk: Makefile cfg-common.h command.c gui/cfg.c gui/interface.c gui/mplayer/gtk/opts.c gui/mplayer/gui_common.c gui/mplayer/mw.c gui/mplayer/pb.c gui/win32/dialogs.c libass/mputils.h l...

cigaes subversion at mplayerhq.hu
Wed Oct 27 19:47:13 CEST 2010 

Author: cigaes
Date: Wed Oct 27 19:47:13 2010
New Revision: 32554

Log:
Move libvo/sub.[ch] from libvo to sub.

Added:
   trunk/sub/sub.c
      - copied, changed from r32553, trunk/libvo/sub.c
   trunk/sub/sub.h
      - copied, changed from r32551, trunk/libvo/sub.h
Deleted:
   trunk/libvo/sub.c
   trunk/libvo/sub.h
Modified:
   trunk/Makefile
   trunk/cfg-common.h
   trunk/command.c
   trunk/gui/cfg.c
   trunk/gui/interface.c
   trunk/gui/mplayer/gtk/opts.c
   trunk/gui/mplayer/gui_common.c
   trunk/gui/mplayer/mw.c
   trunk/gui/mplayer/pb.c
   trunk/gui/win32/dialogs.c
   trunk/libass/mputils.h
   trunk/libmenu/menu.c
   trunk/libmenu/vf_menu.c
   trunk/libmpcodecs/dec_teletext.c
   trunk/libmpcodecs/vf_ass.c
   trunk/libmpcodecs/vf_expand.c
   trunk/libmpcodecs/vf_vo.c
   trunk/libmpdemux/demux_lavf.c
   trunk/libmpdemux/demux_mkv.c
   trunk/libmpdemux/demux_mov.c
   trunk/libmpdemux/demux_ogg.c
   trunk/libmpdemux/demux_ty.c
   trunk/libmpdemux/demux_ty_osd.c
   trunk/libvo/vesa_lvo.c
   trunk/libvo/vo_aa.c
   trunk/libvo/vo_caca.c
   trunk/libvo/vo_dfbmga.c
   trunk/libvo/vo_dga.c
   trunk/libvo/vo_direct3d.c
   trunk/libvo/vo_directfb2.c
   trunk/libvo/vo_directx.c
   trunk/libvo/vo_dxr2.c
   trunk/libvo/vo_dxr3.c
   trunk/libvo/vo_fbdev.c
   trunk/libvo/vo_fbdev2.c
   trunk/libvo/vo_gl.c
   trunk/libvo/vo_gl2.c
   trunk/libvo/vo_kva.c
   trunk/libvo/vo_mga.c
   trunk/libvo/vo_quartz.c
   trunk/libvo/vo_s3fb.c
   trunk/libvo/vo_sdl.c
   trunk/libvo/vo_svga.c
   trunk/libvo/vo_tdfxfb.c
   trunk/libvo/vo_vdpau.c
   trunk/libvo/vo_vesa.c
   trunk/libvo/vo_wii.c
   trunk/libvo/vo_x11.c
   trunk/libvo/vo_xmga.c
   trunk/libvo/vo_xv.c
   trunk/libvo/vo_xvmc.c
   trunk/libvo/vo_xvr100.c
   trunk/libvo/vo_yuv4mpeg.c
   trunk/libvo/vosub_vidix.c
   trunk/mencoder.c
   trunk/mpcommon.c
   trunk/mplayer.c
   trunk/sub/ass_mp.c
   trunk/sub/av_sub.c
   trunk/sub/eosd.c
   trunk/sub/find_sub.c
   trunk/sub/font_load.c
   trunk/sub/spudec.c
   trunk/sub/sub_cc.c
   trunk/sub/subreader.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/Makefile	Wed Oct 27 19:47:13 2010	(r32554)
@@ -505,7 +505,6 @@ SRCS_COMMON = asxparser.c \
               libmpdemux/yuv4mpeg.c \
               libmpdemux/yuv4mpeg_ratio.c \
               libvo/osd.c \
-              libvo/sub.c \
               osdep/$(GETCH) \
               osdep/$(TIMER) \
               stream/open.c \
@@ -519,6 +518,7 @@ SRCS_COMMON = asxparser.c \
               sub/eosd.c \
               sub/find_sub.c \
               sub/spudec.c \
+              sub/sub.c \
               sub/sub_cc.c \
               sub/subreader.c \
               sub/vobsub.c \

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/cfg-common.h	Wed Oct 27 19:47:13 2010	(r32554)
@@ -33,7 +33,7 @@
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/mf.h"
 #include "libpostproc/postprocess.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "osdep/priority.h"
 #include "stream/cdd.h"
 #include "stream/network.h"

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/command.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -29,7 +29,7 @@
 #include "libmpdemux/stheader.h"
 #include "codec-cfg.h"
 #include "mplayer.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "m_option.h"
 #include "m_property.h"
 #include "help_mp.h"

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/gui/cfg.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -32,7 +32,7 @@
 #include "parser-cfg.h"
 #include "path.h"
 #include "libmpcodecs/vd.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "libvo/video_out.h"
 #include "libvo/x11_common.h"
 #include "stream/stream.h"

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/gui/interface.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -46,7 +46,7 @@
 #include "libvo/x11_common.h"
 #include "libvo/video_out.h"
 #include "sub/font_load.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "input/input.h"
 #include "libao2/audio_out.h"
 #include "mixer.h"

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/gui/mplayer/gtk/opts.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -30,7 +30,7 @@
 #include "mixer.h"
 #include "mpcommon.h"
 #include "libao2/audio_out.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "libvo/video_out.h"
 #include "libvo/x11_common.h"
 #include "stream/stream.h"

Modified: trunk/gui/mplayer/gui_common.c
==============================================================================
--- trunk/gui/mplayer/gui_common.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/gui/mplayer/gui_common.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -36,7 +36,7 @@
 
 #include "stream/stream.h"
 #include "mixer.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"

Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/gui/mplayer/mw.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -39,7 +39,7 @@
 #include "stream/stream.h"
 #include "stream/url.h"
 #include "mixer.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "access_mpcontext.h"
 
 #include "libmpcodecs/vd.h"

Modified: trunk/gui/mplayer/pb.c
==============================================================================
--- trunk/gui/mplayer/pb.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/gui/mplayer/pb.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -37,7 +37,7 @@
 
 #include "stream/stream.h"
 #include "mixer.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/gui/win32/dialogs.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -33,7 +33,7 @@
 #include "libmpdemux/stheader.h"
 #include "gui.h"
 #include "dialogs.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "libvo/video_out.h"
 
 WNDPROC OldUrlWndProc;

Modified: trunk/libass/mputils.h
==============================================================================
--- trunk/libass/mputils.h	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libass/mputils.h	Wed Oct 27 19:47:13 2010	(r32554)
@@ -25,7 +25,7 @@
 #include "help_mp.h"
 #include "sub/font_load.h" // for blur()
 #include "sub/subreader.h" // for guess_buffer_cp
-#include "libvo/sub.h" // for utf8_get_char
+#include "sub/sub.h" // for utf8_get_char
 #include "libavutil/common.h"
 
 #endif /* LIBASS_MPUTILS_H */

Modified: trunk/libmenu/menu.c
==============================================================================
--- trunk/libmenu/menu.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmenu/menu.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -28,7 +28,7 @@
 
 #include "libvo/osd.h"
 #include "sub/font_load.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "osdep/keycodes.h"
 #include "asxparser.h"
 #include "stream/stream.h"

Modified: trunk/libmenu/vf_menu.c
==============================================================================
--- trunk/libmenu/vf_menu.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmenu/vf_menu.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -34,7 +34,7 @@
 #include "libvo/fastmemcpy.h"
 #include "libvo/video_out.h"
 #include "sub/font_load.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "input/input.h"
 #include "m_struct.h"
 #include "menu.h"

Modified: trunk/libmpcodecs/dec_teletext.c
==============================================================================
--- trunk/libmpcodecs/dec_teletext.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmpcodecs/dec_teletext.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -62,7 +62,7 @@
  * 4. libmpcodecs/dec_teletext.c: prepare_visible_page(...)
  *      processing page. adding number of just received by background process
  *      teletext page, adding current time,etc.
- * 5. libvo/sub.c: vo_update_text_teletext(...)
+ * 5. sub/sub.c: vo_update_text_teletext(...)
  *      rendering displayable osd with text and graphics
  *
  * TODO:

Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmpcodecs/vf_ass.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -36,7 +36,7 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "m_option.h"
 #include "m_struct.h"
 

Modified: trunk/libmpcodecs/vf_expand.c
==============================================================================
--- trunk/libmpcodecs/vf_expand.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmpcodecs/vf_expand.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -35,7 +35,7 @@
 #include "libavutil/avutil.h"
 
 #ifdef OSD_SUPPORT
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "libvo/osd.h"
 #endif
 

Modified: trunk/libmpcodecs/vf_vo.c
==============================================================================
--- trunk/libmpcodecs/vf_vo.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmpcodecs/vf_vo.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -26,7 +26,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "libvo/video_out.h"
 #include "sub/eosd.h"
 

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmpdemux/demux_lavf.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -33,7 +33,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"

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmpdemux/demux_mkv.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -41,7 +41,7 @@
 
 #include "sub/vobsub.h"
 #include "sub/subreader.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 
 #include "libavutil/common.h"
 

Modified: trunk/libmpdemux/demux_mov.c
==============================================================================
--- trunk/libmpdemux/demux_mov.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmpdemux/demux_mov.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -65,7 +65,7 @@
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 
-#include "libvo/sub.h"
+#include "sub/sub.h"
 
 #include "demux_mov.h"
 #include "qtpalette.h"

Modified: trunk/libmpdemux/demux_ogg.c
==============================================================================
--- trunk/libmpdemux/demux_ogg.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmpdemux/demux_ogg.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -168,7 +168,7 @@ typedef struct ogg_demuxer {
 //                          - subtitles up in demuxer buffer...
 
 #include "sub/subreader.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #define OGG_SUB_MAX_LINE 128
 
 static subtitle ogg_sub;

Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmpdemux/demux_ty.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -40,7 +40,7 @@
 #include "help_mp.h"
 
 #include "libmpcodecs/dec_audio.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "demux_ty_osd.h"

Modified: trunk/libmpdemux/demux_ty_osd.c
==============================================================================
--- trunk/libmpdemux/demux_ty_osd.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libmpdemux/demux_ty_osd.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -25,7 +25,7 @@
 //#include "mp3_hdr.h"
 //#include "sub/subreader.h"
 #include "sub/sub_cc.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "demux_ty_osd.h"
 
 //#include "dvdauth.h"

Modified: trunk/libvo/vesa_lvo.c
==============================================================================
--- trunk/libvo/vesa_lvo.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vesa_lvo.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -40,7 +40,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 */

Modified: trunk/libvo/vo_aa.c
==============================================================================
--- trunk/libvo/vo_aa.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_aa.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -40,7 +40,7 @@
 #include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
 #include "sub/font_load.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "osdep/keycodes.h"
 #include <aalib.h>

Modified: trunk/libvo/vo_caca.c
==============================================================================
--- trunk/libvo/vo_caca.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_caca.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -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"

Modified: trunk/libvo/vo_dfbmga.c
==============================================================================
--- trunk/libvo/vo_dfbmga.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_dfbmga.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -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"

Modified: trunk/libvo/vo_dga.c
==============================================================================
--- trunk/libvo/vo_dga.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_dga.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -333,7 +333,7 @@ static void check_events(void)
 
 //---------------------------------------------------------
 
-#include "sub.h"
+#include "sub/sub.h"
 
 static void draw_osd(void)
 {

Modified: trunk/libvo/vo_direct3d.c
==============================================================================
--- trunk/libvo/vo_direct3d.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_direct3d.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -31,7 +31,7 @@
 #include "w32_common.h"
 #include "libavutil/common.h"
 #include "sub/font_load.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 static const vo_info_t info =
 {

Modified: trunk/libvo/vo_directfb2.c
==============================================================================
--- trunk/libvo/vo_directfb2.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_directfb2.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -33,7 +33,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 "subopt-helper.h"

Modified: trunk/libvo/vo_directx.c
==============================================================================
--- trunk/libvo/vo_directx.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_directx.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -38,7 +38,7 @@
 #include "aspect.h"
 #include "geometry.h"
 #include "mp_fifo.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #ifdef CONFIG_GUI
 #include "gui/interface.h"

Modified: trunk/libvo/vo_dxr2.c
==============================================================================
--- trunk/libvo/vo_dxr2.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_dxr2.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -35,7 +35,7 @@
 #include "video_out_internal.h"
 #include "mp_msg.h"
 #include "m_option.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "path.h"
 #include "libmpcodecs/vd.h"
 #include "libmpdemux/mpeg_packetizer.h"

Modified: trunk/libvo/vo_dxr3.c
==============================================================================
--- trunk/libvo/vo_dxr3.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_dxr3.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -43,7 +43,7 @@
 #include "video_out_internal.h"
 #include "aspect.h"
 #include "spuenc.h"
-#include "sub.h"
+#include "sub/sub.h"
 #ifdef CONFIG_GUI
 #include "gui/interface.h"
 #endif

Modified: trunk/libvo/vo_fbdev.c
==============================================================================
--- trunk/libvo/vo_fbdev.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_fbdev.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -39,7 +39,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "geometry.h"
 #include "vosub_vidix.h"
 #include "aspect.h"

Modified: trunk/libvo/vo_fbdev2.c
==============================================================================
--- trunk/libvo/vo_fbdev2.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_fbdev2.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -34,7 +34,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "mp_msg.h"
 
 static const vo_info_t info = {

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_gl.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -33,7 +33,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "sub/font_load.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "gl_common.h"
 #include "aspect.h"

Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_gl2.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -29,7 +29,7 @@
 #include "subopt-helper.h"
 #include "video_out.h"
 #include "video_out_internal.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "gl_common.h"
 #include "aspect.h"

Modified: trunk/libvo/vo_kva.c
==============================================================================
--- trunk/libvo/vo_kva.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_kva.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -48,7 +48,7 @@
 #include "input/input.h"
 #include "input/mouse.h"
 #include "subopt-helper.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "cpudetect.h"
 #include "libswscale/swscale.h"

Modified: trunk/libvo/vo_mga.c
==============================================================================
--- trunk/libvo/vo_mga.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_mga.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -35,7 +35,7 @@
 #include <linux/fb.h>
 
 #include "drivers/mga_vid.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "aspect.h"
 
 static const vo_info_t info =

Modified: trunk/libvo/vo_quartz.c
==============================================================================
--- trunk/libvo/vo_quartz.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_quartz.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -48,7 +48,7 @@
 #include "m_option.h"
 #include "mp_fifo.h"
 #include "mpbswap.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "input/input.h"
 #include "input/mouse.h"

Modified: trunk/libvo/vo_s3fb.c
==============================================================================
--- trunk/libvo/vo_s3fb.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_s3fb.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -44,7 +44,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "aspect.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 static const vo_info_t info =
   {

Modified: trunk/libvo/vo_sdl.c
==============================================================================
--- trunk/libvo/vo_sdl.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_sdl.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -64,7 +64,7 @@
 #include "video_out_internal.h"
 
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "aspect.h"
 #include "libmpcodecs/vfcap.h"
 

Modified: trunk/libvo/vo_svga.c
==============================================================================
--- trunk/libvo/vo_svga.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_svga.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -57,7 +57,7 @@ TODO:
 #include "osdep/getch2.h"
 #include "vosub_vidix.h"
 
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "mp_msg.h"
 #include "help_mp.h"

Modified: trunk/libvo/vo_tdfxfb.c
==============================================================================
--- trunk/libvo/vo_tdfxfb.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_tdfxfb.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -63,7 +63,7 @@
 #include "video_out_internal.h"
 #include "drivers/3dfx.h"
 #include "aspect.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 static const vo_info_t info =
 {

Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_vdpau.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -42,7 +42,7 @@
 #include "x11_common.h"
 #include "aspect.h"
 #include "sub/font_load.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "sub/eosd.h"
 #include "subopt-helper.h"
 

Modified: trunk/libvo/vo_vesa.c
==============================================================================
--- trunk/libvo/vo_vesa.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_vesa.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -49,7 +49,7 @@
 #include "video_out_internal.h"
 
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"
 #include "aspect.h"

Modified: trunk/libvo/vo_wii.c
==============================================================================
--- trunk/libvo/vo_wii.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_wii.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -51,7 +51,7 @@
 #include "config.h"
 #include "video_out.h"
 #include "video_out_internal.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "mp_msg.h"
 
 static const vo_info_t info = {

Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_x11.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -46,7 +46,7 @@ static int gXErrorFlag;
 static int CompletionType = -1;
 #endif
 
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"

Modified: trunk/libvo/vo_xmga.c
==============================================================================
--- trunk/libvo/vo_xmga.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_xmga.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -46,7 +46,7 @@
 #endif
 
 #include "x11_common.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "aspect.h"
 
 #ifdef SHOW_TIME

Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_xv.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -52,7 +52,7 @@ Buffer allocation:
 #include "x11_common.h"
 
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "aspect.h"
 
 #include "subopt-helper.h"

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_xvmc.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -45,7 +45,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/xvmc.h"
 
-#include "sub.h"
+#include "sub/sub.h"
 #include "aspect.h"
 
 #include "subopt-helper.h"

Modified: trunk/libvo/vo_xvr100.c
==============================================================================
--- trunk/libvo/vo_xvr100.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_xvr100.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -48,7 +48,7 @@
 #include "aspect.h"
 #include "geometry.h"
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "mp_msg.h"
 
 

Modified: trunk/libvo/vo_yuv4mpeg.c
==============================================================================
--- trunk/libvo/vo_yuv4mpeg.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vo_yuv4mpeg.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -52,7 +52,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "fastmemcpy.h"
 #include "libavutil/rational.h"

Modified: trunk/libvo/vosub_vidix.c
==============================================================================
--- trunk/libvo/vosub_vidix.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/libvo/vosub_vidix.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -42,7 +42,7 @@
 #include "fastmemcpy.h"
 #include "osd.h"
 #include "video_out.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "vosub_vidix.h"
 
 #include "libmpcodecs/vfcap.h"

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/mencoder.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -73,7 +73,7 @@
 #include "libmpdemux/stheader.h"
 #include "libvo/fastmemcpy.h"
 #include "sub/font_load.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "libvo/video_out.h"
 #include "osdep/timer.h"
 #include "stream/stream.h"

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/mpcommon.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -29,7 +29,7 @@
 #include "path.h"
 #include "mplayer.h"
 #include "sub/font_load.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "libvo/video_out.h"
 #include "cpudetect.h"
 #include "help_mp.h"

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/mplayer.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -87,7 +87,7 @@
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 #include "sub/font_load.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "libvo/video_out.h"
 #include "stream/cache2.h"
 #include "stream/stream.h"

Modified: trunk/sub/ass_mp.c
==============================================================================
--- trunk/sub/ass_mp.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/sub/ass_mp.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -30,7 +30,7 @@
 #include "ass_mp.h"
 #include "eosd.h"
 #include "mpcommon.h"
-#include "libvo/sub.h"
+#include "sub.h"
 #include "help_mp.h"
 #include "font_load.h"
 #include "stream/stream.h"

Modified: trunk/sub/av_sub.c
==============================================================================
--- trunk/sub/av_sub.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/sub/av_sub.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -18,7 +18,7 @@
 
 #include "libavcodec/avcodec.h"
 #include "libmpdemux/stheader.h"
-#include "libvo/sub.h"
+#include "sub.h"
 #include "spudec.h"
 #include "av_sub.h"
 

Modified: trunk/sub/eosd.c
==============================================================================
--- trunk/sub/eosd.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/sub/eosd.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -22,7 +22,7 @@
 #include "mpcommon.h"
 #include "libmpcodecs/vf.h"
 #include "libvo/video_out.h"
-#include "libvo/sub.h"
+#include "sub.h"
 #include "ass_mp.h"
 #include "eosd.h"
 

Modified: trunk/sub/find_sub.c
==============================================================================
--- trunk/sub/find_sub.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/sub/find_sub.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #include "libvo/video_out.h"
-#include "libvo/sub.h"
+#include "sub.h"
 #include "subreader.h"
 
 #include "mp_msg.h"

Modified: trunk/sub/font_load.c
==============================================================================
--- trunk/sub/font_load.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/sub/font_load.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -26,7 +26,7 @@
 #include <unistd.h>
 
 #include "font_load.h"
-#include "libvo/sub.h"
+#include "sub.h"
 #include "mp_msg.h"
 
 raw_file* load_raw(char *name,int verbose){

Modified: trunk/sub/spudec.c
==============================================================================
--- trunk/sub/spudec.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/sub/spudec.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <math.h>
-#include "libvo/sub.h"
+#include "sub.h"
 #include "libvo/video_out.h"
 #include "spudec.h"
 #include "vobsub.h"

Copied and modified: trunk/sub/sub.c (from r32553, trunk/libvo/sub.c)
==============================================================================
--- trunk/libvo/sub.c	Wed Oct 27 19:37:29 2010	(r32553, copy source)
+++ trunk/sub/sub.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -35,10 +35,10 @@
 #include "mpcommon.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "video_out.h"
-#include "sub/font_load.h"
+#include "libvo/video_out.h"
+#include "font_load.h"
 #include "sub.h"
-#include "sub/spudec.h"
+#include "spudec.h"
 #include "libavutil/common.h"
 
 #define NEW_SPLITTING

Copied and modified: trunk/sub/sub.h (from r32551, trunk/libvo/sub.h)
==============================================================================
--- trunk/libvo/sub.h	Wed Oct 27 19:21:43 2010	(r32551, copy source)
+++ trunk/sub/sub.h	Wed Oct 27 19:47:13 2010	(r32554)
@@ -67,7 +67,7 @@ typedef struct mp_osd_obj_s {
 } mp_osd_obj_t;
 
 
-#include "sub/subreader.h"
+#include "subreader.h"
 
 extern sub_data* subdata; //currently used subtitles
 extern subtitle* vo_sub;

Modified: trunk/sub/sub_cc.c
==============================================================================
--- trunk/sub/sub_cc.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/sub/sub_cc.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -38,7 +38,7 @@
 #include "subreader.h"
 
 #include "libvo/video_out.h"
-#include "libvo/sub.h"
+#include "sub.h"
 
 
 #define CC_MAX_LINE_LENGTH 64

Modified: trunk/sub/subreader.c
==============================================================================
--- trunk/sub/subreader.c	Wed Oct 27 19:37:29 2010	(r32553)
+++ trunk/sub/subreader.c	Wed Oct 27 19:47:13 2010	(r32554)
@@ -35,7 +35,7 @@
 #include "mpcommon.h"
 #include "subreader.h"
 #include "subassconvert.h"
-#include "libvo/sub.h"
+#include "sub.h"
 #include "stream/stream.h"
 #include "libavutil/common.h"
 #include "libavutil/avstring.h"

More information about the MPlayer-cvslog mailing list