Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
Author: diego
Date: Fri Sep 17 17:13:37 2010
New Revision: 32293

Log:
Move libass/ass_mp.[ch] ---> ass_mp.[ch].
ass_mp.[ch] is not part of libass and no other external library glue code
is kept in the same directory as the imported external library.

Added:
   trunk/ass_mp.c
      - copied unchanged from r32290, trunk/libass/ass_mp.c
   trunk/ass_mp.h
      - copied, changed from r32290, trunk/libass/ass_mp.h
Deleted:
   trunk/libass/ass_mp.c
   trunk/libass/ass_mp.h
Modified:
   trunk/Makefile
   trunk/command.c
   trunk/eosd.c
   trunk/eosd.h
   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/subreader.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/Makefile	Fri Sep 17 17:13:37 2010	(r32293)
@@ -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 \
-                                        libass/ass_mp.c \
+                                        ass_mp.c \
                                         subassconvert.c \
 
 SRCS_COMMON-$(LIBASS_INTERNAL)       += libass/ass.c \

Copied and modified: trunk/ass_mp.h (from r32290, trunk/libass/ass_mp.h)
==============================================================================
--- trunk/libass/ass_mp.h	Fri Sep 17 12:35:15 2010	(r32290, copy source)
+++ trunk/ass_mp.h	Fri Sep 17 17:13:37 2010	(r32293)
@@ -1,32 +1,32 @@
 /*
  * Copyright (C) 2006 Evgeniy Stepanov 
  *
- * This file is part of libass.
+ * This file is part of MPlayer.
  *
- * libass is free software; you can redistribute it and/or modify
+ * MPlayer is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * libass is distributed in the hope that it will be useful,
+ * MPlayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with libass; if not, write to the Free Software Foundation, Inc.,
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef LIBASS_MP_H
-#define LIBASS_MP_H
+#ifndef MPLAYER_ASS_MP_H
+#define MPLAYER_ASS_MP_H
 
 #include "config.h"
 #include 
 
 #include "subreader.h"
 #if defined(CONFIG_ASS_INTERNAL) || !defined(CONFIG_ASS)
-#include "ass.h"
+#include "libass/ass.h"
 #else
 #include 
 #endif
@@ -62,4 +62,4 @@ typedef struct {
 extern int ass_force_reload;
 ASS_Image* ass_mp_render_frame(ASS_Renderer *priv, ASS_Track* track, long
long now, int* detect_change);
 
-#endif /* LIBASS_MP_H */
+#endif /* MPLAYER_ASS_MP_H */

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/command.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -58,7 +58,7 @@
 #include "stream/stream_dvd.h"
 #endif
 #include "stream/stream_dvdnav.h"
-#include "libass/ass_mp.h"
+#include "ass_mp.h"
 #include "m_struct.h"
 #include "libmenu/menu.h"
 #include "gui/interface.h"

Modified: trunk/eosd.c
==============================================================================
--- trunk/eosd.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/eosd.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -23,7 +23,7 @@
 #include "libmpcodecs/vf.h"
 #include "libvo/video_out.h"
 #include "libvo/sub.h"
-#include "libass/ass_mp.h"
+#include "ass_mp.h"
 #include "eosd.h"
 
 #ifdef CONFIG_ASS

Modified: trunk/eosd.h
==============================================================================
--- trunk/eosd.h	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/eosd.h	Fri Sep 17 17:13:37 2010	(r32293)
@@ -22,9 +22,9 @@
 #ifndef MPLAYER_EOSD_H
 #define MPLAYER_EOSD_H
 
-#include "libass/ass_mp.h"
 #include "libmpcodecs/vf.h"
 #include "libvo/video_out.h"
+#include "ass_mp.h"
 
 /**
  * Initialize the EOSD subsystem.

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/gui/cfg.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -21,6 +21,7 @@
 #include 
 
 #include "config.h"
+#include "ass_mp.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "mixer.h"
@@ -36,7 +37,6 @@
 #include "libvo/x11_common.h"
 #include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
-#include "libass/ass_mp.h"
 
 #include "cfg.h"
 #include "app.h"

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/gui/interface.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -33,6 +33,7 @@
 #include "mplayer/play.h"
 
 #include "access_mpcontext.h"
+#include "ass_mp.h"
 #include "app.h"
 #include "cfg.h"
 #include "help_mp.h"
@@ -51,7 +52,6 @@
 #include "mixer.h"
 #include "libaf/af.h"
 #include "libaf/equalizer.h"
-#include "libass/ass_mp.h"
 
 #ifdef CONFIG_ICONV
 #include 

Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/libmpcodecs/vf_ass.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -41,7 +41,7 @@
 #include "m_option.h"
 #include "m_struct.h"
 
-#include "libass/ass_mp.h"
+#include "ass_mp.h"
 #include "eosd.h"
 
 #define _r(c)  ((c)>>24)

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/libmpdemux/demux_mkv.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -35,6 +35,7 @@
 #include "matroska.h"
 #include "demux_real.h"
 
+#include "ass_mp.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
@@ -42,8 +43,6 @@
 #include "subreader.h"
 #include "libvo/sub.h"
 
-#include "libass/ass_mp.h"
-
 #include "libavutil/common.h"
 
 #ifdef CONFIG_QTX_CODECS

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/libmpdemux/demuxer.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -46,7 +46,7 @@
 
 #ifdef CONFIG_ASS
 #include "libass/ass.h"
-#include "libass/ass_mp.h"
+#include "ass_mp.h"
 #endif
 
 #ifdef CONFIG_FFMPEG

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/libmpdemux/demuxer.h	Fri Sep 17 17:13:37 2010	(r32293)
@@ -26,7 +26,7 @@
 
 #include "stream/stream.h"
 #ifdef CONFIG_ASS
-#include "libass/ass_mp.h"
+#include "ass_mp.h"
 #endif
 #include "m_option.h"
 

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/libvo/vo_gl.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -27,6 +27,7 @@
 #include 
 
 #include "config.h"
+#include "ass_mp.h"
 #include "mp_msg.h"
 #include "subopt-helper.h"
 #include "video_out.h"
@@ -37,7 +38,6 @@
 #include "gl_common.h"
 #include "aspect.h"
 #include "fastmemcpy.h"
-#include "libass/ass_mp.h"
 
 #ifdef CONFIG_GL_SDL
 #ifdef CONFIG_SDL_SDL_H

Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/libvo/vo_vdpau.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -35,6 +35,7 @@
 #include 
 
 #include "config.h"
+#include "ass_mp.h"
 #include "mp_msg.h"
 #include "video_out.h"
 #include "video_out_internal.h"
@@ -49,7 +50,6 @@
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 
-#include "libass/ass_mp.h"
 
 static vo_info_t info = {
     "VDPAU with X11",

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/mencoder.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -58,7 +58,6 @@
 #include "input/input.h"
 #include "libaf/af_format.h"
 #include "libao2/audio_out.h"
-#include "libass/ass_mp.h"
 #include "libavcodec/avcodec.h"
 #include "libmpcodecs/ae.h"
 #include "libmpcodecs/dec_audio.h"
@@ -84,6 +83,7 @@
 #include "stream/stream_dvd.h"
 #endif
 #include "stream/stream_dvdnav.h"
+#include "ass_mp.h"
 #include "codec-cfg.h"
 #include "edl.h"
 #include "help_mp.h"

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/mpcommon.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -38,7 +38,7 @@
 double sub_last_pts = -303;
 
 #ifdef CONFIG_ASS
-#include "libass/ass_mp.h"
+#include "ass_mp.h"
 ASS_Track* ass_track = 0; // current track to render
 #endif
 

Modified: trunk/mpcommon.h
==============================================================================
--- trunk/mpcommon.h	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/mpcommon.h	Fri Sep 17 17:13:37 2010	(r32293)
@@ -23,7 +23,7 @@
 #include "m_option.h"
 #include "subreader.h"
 #include "libmpdemux/demuxer.h"
-#include "libass/ass_mp.h"
+#include "ass_mp.h"
 
 struct sh_video;
 

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/mplayer.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -76,7 +76,6 @@
 #include "gui/interface.h"
 #include "input/input.h"
 #include "libao2/audio_out.h"
-#include "libass/ass_mp.h"
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "libmenu/menu.h"
@@ -97,6 +96,7 @@
 #include "stream/stream_radio.h"
 #include "stream/tv.h"
 #include "access_mpcontext.h"
+#include "ass_mp.h"
 #include "cfg-mplayer-def.h"
 #include "codec-cfg.h"
 #include "command.h"

Modified: trunk/subreader.c
==============================================================================
--- trunk/subreader.c	Fri Sep 17 17:02:46 2010	(r32292)
+++ trunk/subreader.c	Fri Sep 17 17:13:37 2010	(r32293)
@@ -29,6 +29,7 @@
 #include 
 #include 
 
+#include "ass_mp.h"
 #include "config.h"
 #include "mp_msg.h"
 #include "mpcommon.h"
@@ -38,7 +39,6 @@
 #include "stream/stream.h"
 #include "libavutil/common.h"
 #include "libavutil/avstring.h"
-#include "libass/ass_mp.h"
 
 #ifdef CONFIG_ENCA
 #include 
 
CD: 4ms