[MPlayer-cvslog] r32545 - in trunk: Makefile libmpdemux/demux_ty.c libmpdemux/demux_ty_osd.c libmpdemux/video.c sub/sub_cc.c sub/sub_cc.h sub_cc.c sub_cc.h

[cigaes]

Author: cigaes
Date: Wed Oct 27 18:48:21 2010
New Revision: 32545

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

Added:
   trunk/sub/sub_cc.c
      - copied, changed from r32541, trunk/sub_cc.c
   trunk/sub/sub_cc.h
      - copied unchanged from r32541, trunk/sub_cc.h
Deleted:
   trunk/sub_cc.c
   trunk/sub_cc.h
Modified:
   trunk/Makefile
   trunk/libmpdemux/demux_ty.c
   trunk/libmpdemux/demux_ty_osd.c
   trunk/libmpdemux/video.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Oct 27 18:42:23 2010	(r32544)
+++ trunk/Makefile	Wed Oct 27 18:48:21 2010	(r32545)
@@ -346,7 +346,6 @@ SRCS_COMMON = asxparser.c \
               path.c \
               playtree.c \
               playtreeparser.c \
-              sub_cc.c \
               subopt-helper.c \
               vobsub.c \
               libaf/af.c \
@@ -521,6 +520,7 @@ SRCS_COMMON = asxparser.c \
               stream/url.c \
               sub/find_sub.c \
               sub/spudec.c \
+              sub/sub_cc.c \
               sub/subreader.c \
               $(SRCS_COMMON-yes)
 

Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c	Wed Oct 27 18:42:23 2010	(r32544)
+++ trunk/libmpdemux/demux_ty.c	Wed Oct 27 18:48:21 2010	(r32545)
@@ -46,7 +46,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 "libavutil/intreadwrite.h"
 

Modified: trunk/libmpdemux/demux_ty_osd.c
==============================================================================
--- trunk/libmpdemux/demux_ty_osd.c	Wed Oct 27 18:42:23 2010	(r32544)
+++ trunk/libmpdemux/demux_ty_osd.c	Wed Oct 27 18:48:21 2010	(r32545)
@@ -24,7 +24,7 @@
 //#include "stheader.h"
 //#include "mp3_hdr.h"
 //#include "sub/subreader.h"
-#include "sub_cc.h"
+#include "sub/sub_cc.h"
 #include "libvo/sub.h"
 #include "demux_ty_osd.h"
 

Modified: trunk/libmpdemux/video.c
==============================================================================
--- trunk/libmpdemux/video.c	Wed Oct 27 18:42:23 2010	(r32544)
+++ trunk/libmpdemux/video.c	Wed Oct 27 18:48:21 2010	(r32545)
@@ -39,7 +39,7 @@
 #include "mpeg_hdr.h"
 
 /* sub_cc (closed captions)*/
-#include "sub_cc.h"
+#include "sub/sub_cc.h"
 
 /* biCompression constant */
 #define BI_RGB        0L

Copied and modified: trunk/sub/sub_cc.c (from r32541, trunk/sub_cc.c)
==============================================================================
--- trunk/sub_cc.c	Wed Oct 27 18:28:50 2010	(r32541, copy source)
+++ trunk/sub/sub_cc.c	Wed Oct 27 18:48:21 2010	(r32545)
@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "sub_cc.h"
+#include "sub/sub_cc.h"
 
 #include "sub/subreader.h"