[MPlayer-cvslog] r32543 - in trunk: Makefile TOOLS/subrip.c av_sub.c command.c libvo/sub.c mencoder.c mpcommon.c mplayer.c spudec.c spudec.h stream/stream_dvdnav.c sub/spudec.c sub/spudec.h vobsub.c

[cigaes]

Author: cigaes
Date: Wed Oct 27 18:38:51 2010
New Revision: 32543

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

Added:
   trunk/sub/spudec.c
      - copied, changed from r32541, trunk/spudec.c
   trunk/sub/spudec.h
      - copied unchanged from r32541, trunk/spudec.h
Deleted:
   trunk/spudec.c
   trunk/spudec.h
Modified:
   trunk/Makefile
   trunk/TOOLS/subrip.c
   trunk/av_sub.c
   trunk/command.c
   trunk/libvo/sub.c
   trunk/mencoder.c
   trunk/mpcommon.c
   trunk/mplayer.c
   trunk/stream/stream_dvdnav.c
   trunk/vobsub.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Oct 27 18:32:03 2010	(r32542)
+++ trunk/Makefile	Wed Oct 27 18:38:51 2010	(r32543)
@@ -346,7 +346,6 @@ SRCS_COMMON = asxparser.c \
               path.c \
               playtree.c \
               playtreeparser.c \
-              spudec.c \
               sub_cc.c \
               subopt-helper.c \
               vobsub.c \
@@ -521,6 +520,7 @@ SRCS_COMMON = asxparser.c \
               stream/stream_null.c \
               stream/url.c \
               sub/find_sub.c \
+              sub/spudec.c \
               sub/subreader.c \
               $(SRCS_COMMON-yes)
 
@@ -1059,7 +1059,7 @@ toolsclean:
 
 TOOLS/bmovl-test$(EXESUF): -lSDL_image
 
-TOOLS/subrip$(EXESUF): vobsub.o spudec.o unrar_exec.o libvo/aclib.o \
+TOOLS/subrip$(EXESUF): vobsub.o sub/spudec.o unrar_exec.o libvo/aclib.o \
     ffmpeg/libswscale/libswscale.a ffmpeg/libavutil/libavutil.a $(TEST_OBJS)
 
 TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32

Modified: trunk/TOOLS/subrip.c
==============================================================================
--- trunk/TOOLS/subrip.c	Wed Oct 27 18:32:03 2010	(r32542)
+++ trunk/TOOLS/subrip.c	Wed Oct 27 18:38:51 2010	(r32543)
@@ -32,7 +32,7 @@
 #include <sys/wait.h>
 #include "libvo/video_out.h"
 #include "vobsub.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 
 /* linking hacks */
 char *mplayer_version;

Modified: trunk/av_sub.c
==============================================================================
--- trunk/av_sub.c	Wed Oct 27 18:32:03 2010	(r32542)
+++ trunk/av_sub.c	Wed Oct 27 18:38:51 2010	(r32543)
@@ -19,7 +19,7 @@
 #include "libavcodec/avcodec.h"
 #include "libmpdemux/stheader.h"
 #include "libvo/sub.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 #include "av_sub.h"
 
 void reset_avsub(struct sh_sub *sh)

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Wed Oct 27 18:32:03 2010	(r32542)
+++ trunk/command.c	Wed Oct 27 18:38:51 2010	(r32543)
@@ -45,7 +45,7 @@
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/dec_teletext.h"
 #include "vobsub.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 #include "path.h"
 #include "stream/tv.h"
 #include "stream/stream_radio.h"

Modified: trunk/libvo/sub.c
==============================================================================
--- trunk/libvo/sub.c	Wed Oct 27 18:32:03 2010	(r32542)
+++ trunk/libvo/sub.c	Wed Oct 27 18:38:51 2010	(r32543)
@@ -38,7 +38,7 @@
 #include "video_out.h"
 #include "font_load.h"
 #include "sub.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 #include "libavutil/common.h"
 
 #define NEW_SPLITTING

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Wed Oct 27 18:32:03 2010	(r32542)
+++ trunk/mencoder.c	Wed Oct 27 18:38:51 2010	(r32543)
@@ -94,7 +94,7 @@
 #include "parser-cfg.h"
 #include "parser-mecmd.h"
 #include "path.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 #include "vobsub.h"
 #include "eosd.h"
 #include "mencoder.h"

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Wed Oct 27 18:32:03 2010	(r32542)
+++ trunk/mpcommon.c	Wed Oct 27 18:38:51 2010	(r32543)
@@ -34,7 +34,7 @@
 #include "cpudetect.h"
 #include "help_mp.h"
 #include "mp_msg.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 #include "version.h"
 #include "vobsub.h"
 #include "av_sub.h"

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Oct 27 18:32:03 2010	(r32542)
+++ trunk/mplayer.c	Wed Oct 27 18:38:51 2010	(r32543)
@@ -120,7 +120,7 @@
 #include "path.h"
 #include "playtree.h"
 #include "playtreeparser.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 #include "sub/subreader.h"
 #include "vobsub.h"
 #include "eosd.h"

Modified: trunk/stream/stream_dvdnav.c
==============================================================================
--- trunk/stream/stream_dvdnav.c	Wed Oct 27 18:32:03 2010	(r32542)
+++ trunk/stream/stream_dvdnav.c	Wed Oct 27 18:38:51 2010	(r32543)
@@ -32,7 +32,7 @@
 #include "stream_dvdnav.h"
 #include "libvo/video_out.h"
 #include "libavutil/common.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 #include "m_option.h"
 #include "m_struct.h"
 #include "help_mp.h"

Copied and modified: trunk/sub/spudec.c (from r32541, trunk/spudec.c)
==============================================================================
--- trunk/spudec.c	Wed Oct 27 18:28:50 2010	(r32541, copy source)
+++ trunk/sub/spudec.c	Wed Oct 27 18:38:51 2010	(r32543)
@@ -39,7 +39,7 @@
 #include <math.h>
 #include "libvo/sub.h"
 #include "libvo/video_out.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 #include "vobsub.h"
 #include "libavutil/avutil.h"
 #include "libavutil/intreadwrite.h"

Modified: trunk/vobsub.c
==============================================================================
--- trunk/vobsub.c	Wed Oct 27 18:32:03 2010	(r32542)
+++ trunk/vobsub.c	Wed Oct 27 18:38:51 2010	(r32543)
@@ -34,7 +34,7 @@
 #include "config.h"
 #include "mpcommon.h"
 #include "vobsub.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 #include "mp_msg.h"
 #include "unrar_exec.h"
 #include "libavutil/common.h"