[MPlayer-cvslog] r32548 - in trunk: Makefile ass_mp.c ass_mp.h command.c gui/cfg.c gui/interface.c libmpcodecs/vf_ass.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_gl.c libvo/vo_vdpau....
cigaes
subversion at mplayerhq.hu
Wed Oct 27 19:08:37 CEST 2010
Author: cigaes
Date: Wed Oct 27 19:08:36 2010
New Revision: 32548
Log:
Move ass_mp.[ch] to the sub directory.
Added:
trunk/sub/ass_mp.c
- copied, changed from r32547, trunk/ass_mp.c
trunk/sub/ass_mp.h
- copied unchanged from r32541, trunk/ass_mp.h
Deleted:
trunk/ass_mp.c
trunk/ass_mp.h
Modified:
trunk/Makefile
trunk/command.c
trunk/gui/cfg.c
trunk/gui/interface.c
trunk/libmpcodecs/vf_ass.c
trunk/libmpdemux/demux_mkv.c
trunk/libmpdemux/demuxer.c
trunk/libmpdemux/demuxer.h
trunk/libvo/vo_gl.c
trunk/libvo/vo_vdpau.c
trunk/mencoder.c
trunk/mpcommon.c
trunk/mpcommon.h
trunk/mplayer.c
trunk/sub/eosd.c
trunk/sub/subreader.c
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/Makefile Wed Oct 27 19:08:36 2010 (r32548)
@@ -128,7 +128,7 @@ SRCS_COMMON-$(JPEG) +=
SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c
SRCS_COMMON-$(LIBASS) += libmpcodecs/vf_ass.c \
- ass_mp.c \
+ sub/ass_mp.c \
subassconvert.c \
SRCS_COMMON-$(LIBASS_INTERNAL) += libass/ass.c \
Modified: trunk/command.c
==============================================================================
--- trunk/command.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/command.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -58,7 +58,7 @@
#include "stream/stream_dvd.h"
#endif
#include "stream/stream_dvdnav.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "m_struct.h"
#include "libmenu/menu.h"
#include "gui/interface.h"
Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/gui/cfg.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -21,7 +21,7 @@
#include <string.h>
#include "config.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "mp_msg.h"
#include "help_mp.h"
#include "mixer.h"
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/gui/interface.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -33,7 +33,7 @@
#include "mplayer/play.h"
#include "access_mpcontext.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "app.h"
#include "cfg.h"
#include "help_mp.h"
Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/libmpcodecs/vf_ass.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -40,7 +40,7 @@
#include "m_option.h"
#include "m_struct.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "sub/eosd.h"
#define _r(c) ((c)>>24)
Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/libmpdemux/demux_mkv.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -35,7 +35,7 @@
#include "matroska.h"
#include "demux_real.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "mp_msg.h"
#include "help_mp.h"
Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/libmpdemux/demuxer.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -48,7 +48,7 @@
#ifdef CONFIG_ASS
#include "libass/ass.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#endif
#ifdef CONFIG_FFMPEG
Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/libmpdemux/demuxer.h Wed Oct 27 19:08:36 2010 (r32548)
@@ -26,7 +26,7 @@
#include "stream/stream.h"
#ifdef CONFIG_ASS
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#endif
#include "m_option.h"
Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/libvo/vo_gl.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -27,7 +27,7 @@
#include <math.h>
#include "config.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "mp_msg.h"
#include "subopt-helper.h"
#include "video_out.h"
Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/libvo/vo_vdpau.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -35,7 +35,7 @@
#include <stdio.h>
#include "config.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "mp_msg.h"
#include "video_out.h"
#include "video_out_internal.h"
Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/mencoder.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -82,7 +82,7 @@
#include "stream/stream_dvd.h"
#endif
#include "stream/stream_dvdnav.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "codec-cfg.h"
#include "edl.h"
#include "help_mp.h"
Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/mpcommon.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -46,7 +46,7 @@
double sub_last_pts = -303;
#ifdef CONFIG_ASS
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
ASS_Track* ass_track = 0; // current track to render
#endif
Modified: trunk/mpcommon.h
==============================================================================
--- trunk/mpcommon.h Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/mpcommon.h Wed Oct 27 19:08:36 2010 (r32548)
@@ -23,7 +23,7 @@
#include "m_option.h"
#include "sub/subreader.h"
#include "libmpdemux/demuxer.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
struct sh_video;
Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/mplayer.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -96,7 +96,7 @@
#include "stream/stream_radio.h"
#include "stream/tv.h"
#include "access_mpcontext.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "cfg-mplayer-def.h"
#include "codec-cfg.h"
#include "command.h"
Copied and modified: trunk/sub/ass_mp.c (from r32547, trunk/ass_mp.c)
==============================================================================
--- trunk/ass_mp.c Wed Oct 27 19:03:26 2010 (r32547, copy source)
+++ trunk/sub/ass_mp.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -27,7 +27,7 @@
#include "path.h"
#include "sub/subreader.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "sub/eosd.h"
#include "mpcommon.h"
#include "libvo/sub.h"
Modified: trunk/sub/eosd.c
==============================================================================
--- trunk/sub/eosd.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/sub/eosd.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -23,7 +23,7 @@
#include "libmpcodecs/vf.h"
#include "libvo/video_out.h"
#include "libvo/sub.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "sub/eosd.h"
static struct mp_eosd_source *sources;
Modified: trunk/sub/subreader.c
==============================================================================
--- trunk/sub/subreader.c Wed Oct 27 19:03:26 2010 (r32547)
+++ trunk/sub/subreader.c Wed Oct 27 19:08:36 2010 (r32548)
@@ -29,7 +29,7 @@
#include <sys/types.h>
#include <dirent.h>
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
#include "config.h"
#include "mp_msg.h"
#include "mpcommon.h"
More information about the MPlayer-cvslog
mailing list