[MPlayer-cvslog] r32549 - in trunk: Makefile sub/subassconvert.c sub/subassconvert.h sub/subreader.c subassconvert.c subassconvert.h

[cigaes]

Author: cigaes
Date: Wed Oct 27 19:12:30 2010
New Revision: 32549

Log:
Move ass_mp.[ch] to the sub directory.

Added:
   trunk/sub/subassconvert.c
      - copied, changed from r32541, trunk/subassconvert.c
   trunk/sub/subassconvert.h
      - copied unchanged from r32541, trunk/subassconvert.h
Deleted:
   trunk/subassconvert.c
   trunk/subassconvert.h
Modified:
   trunk/Makefile
   trunk/sub/subreader.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Oct 27 19:08:36 2010	(r32548)
+++ trunk/Makefile	Wed Oct 27 19:12:30 2010	(r32549)
@@ -129,7 +129,7 @@ SRCS_COMMON-$(LADSPA)                += 
 SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_liba52.c
 SRCS_COMMON-$(LIBASS)                += libmpcodecs/vf_ass.c \
                                         sub/ass_mp.c \
-                                        subassconvert.c \
+                                        sub/subassconvert.c \
 
 SRCS_COMMON-$(LIBASS_INTERNAL)       += libass/ass.c \
                                         libass/ass_bitmap.c \

Copied and modified: trunk/sub/subassconvert.c (from r32541, trunk/subassconvert.c)
==============================================================================
--- trunk/subassconvert.c	Wed Oct 27 18:28:50 2010	(r32541, copy source)
+++ trunk/sub/subassconvert.c	Wed Oct 27 19:12:30 2010	(r32549)
@@ -27,7 +27,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "bstr.h"
-#include "subassconvert.h"
+#include "sub/subassconvert.h"
 #include "libavutil/common.h"
 
 struct line {

Modified: trunk/sub/subreader.c
==============================================================================
--- trunk/sub/subreader.c	Wed Oct 27 19:08:36 2010	(r32548)
+++ trunk/sub/subreader.c	Wed Oct 27 19:12:30 2010	(r32549)
@@ -34,7 +34,7 @@
 #include "mp_msg.h"
 #include "mpcommon.h"
 #include "sub/subreader.h"
-#include "subassconvert.h"
+#include "sub/subassconvert.h"
 #include "libvo/sub.h"
 #include "stream/stream.h"
 #include "libavutil/common.h"