[MPlayer-cvslog] r32546 - in trunk: Makefile TOOLS/subrip.c cfg-mplayer.h command.c libmpdemux/demux_mkv.c mencoder.c mpcommon.c mplayer.c sub/spudec.c sub/unrar_exec.c sub/unrar_exec.h sub/vobsub.c sub/vobsub.h un...

cigaes subversion at mplayerhq.hu
Wed Oct 27 18:58:23 CEST 2010


Author: cigaes
Date: Wed Oct 27 18:58:23 2010
New Revision: 32546

Log:
Move vobsub.[ch] and unrar_exec.[ch] to the sub directory.

Added:
   trunk/sub/unrar_exec.c
      - copied, changed from r32541, trunk/unrar_exec.c
   trunk/sub/unrar_exec.h
      - copied unchanged from r32541, trunk/unrar_exec.h
   trunk/sub/vobsub.c
      - copied, changed from r32543, trunk/vobsub.c
   trunk/sub/vobsub.h
      - copied unchanged from r32541, trunk/vobsub.h
Deleted:
   trunk/unrar_exec.c
   trunk/unrar_exec.h
   trunk/vobsub.c
   trunk/vobsub.h
Modified:
   trunk/Makefile
   trunk/TOOLS/subrip.c
   trunk/cfg-mplayer.h
   trunk/command.c
   trunk/libmpdemux/demux_mkv.c
   trunk/mencoder.c
   trunk/mpcommon.c
   trunk/mplayer.c
   trunk/sub/spudec.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Oct 27 18:48:21 2010	(r32545)
+++ trunk/Makefile	Wed Oct 27 18:58:23 2010	(r32546)
@@ -278,7 +278,7 @@ SRCS_COMMON-$(TV_DSHOW)              += 
 
 SRCS_COMMON-$(TV_V4L1)               += stream/tvi_v4l.c  stream/audio_in.c
 SRCS_COMMON-$(TV_V4L2)               += stream/tvi_v4l2.c stream/audio_in.c
-SRCS_COMMON-$(UNRAR_EXEC)            += unrar_exec.c
+SRCS_COMMON-$(UNRAR_EXEC)            += sub/unrar_exec.c
 SRCS_COMMON-$(VCD)                   += stream/stream_vcd.c
 SRCS_COMMON-$(VORBIS)                += libmpcodecs/ad_libvorbis.c \
                                         libmpdemux/demux_ogg.c
@@ -347,7 +347,6 @@ SRCS_COMMON = asxparser.c \
               playtree.c \
               playtreeparser.c \
               subopt-helper.c \
-              vobsub.c \
               libaf/af.c \
               libaf/af_center.c \
               libaf/af_channels.c \
@@ -522,6 +521,7 @@ SRCS_COMMON = asxparser.c \
               sub/spudec.c \
               sub/sub_cc.c \
               sub/subreader.c \
+              sub/vobsub.c \
               $(SRCS_COMMON-yes)
 
 
@@ -1059,8 +1059,9 @@ toolsclean:
 
 TOOLS/bmovl-test$(EXESUF): -lSDL_image
 
-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/subrip$(EXESUF): sub/vobsub.o sub/spudec.o sub/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:48:21 2010	(r32545)
+++ trunk/TOOLS/subrip.c	Wed Oct 27 18:58:23 2010	(r32546)
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "libvo/video_out.h"
-#include "vobsub.h"
+#include "sub/vobsub.h"
 #include "sub/spudec.h"
 
 /* linking hacks */

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Wed Oct 27 18:48:21 2010	(r32545)
+++ trunk/cfg-mplayer.h	Wed Oct 27 18:58:23 2010	(r32546)
@@ -35,7 +35,7 @@
 #include "libvo/vo_fbdev.h"
 #include "libvo/vo_zr.h"
 #include "mp_fifo.h"
-#include "unrar_exec.h"
+#include "sub/unrar_exec.h"
 
 
 const m_option_t vd_conf[]={

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Wed Oct 27 18:48:21 2010	(r32545)
+++ trunk/command.c	Wed Oct 27 18:58:23 2010	(r32546)
@@ -44,7 +44,7 @@
 #include "mixer.h"
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/dec_teletext.h"
-#include "vobsub.h"
+#include "sub/vobsub.h"
 #include "sub/spudec.h"
 #include "path.h"
 #include "stream/tv.h"

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	Wed Oct 27 18:48:21 2010	(r32545)
+++ trunk/libmpdemux/demux_mkv.c	Wed Oct 27 18:58:23 2010	(r32546)
@@ -39,7 +39,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "vobsub.h"
+#include "sub/vobsub.h"
 #include "sub/subreader.h"
 #include "libvo/sub.h"
 

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Wed Oct 27 18:48:21 2010	(r32545)
+++ trunk/mencoder.c	Wed Oct 27 18:58:23 2010	(r32546)
@@ -95,7 +95,7 @@
 #include "parser-mecmd.h"
 #include "path.h"
 #include "sub/spudec.h"
-#include "vobsub.h"
+#include "sub/vobsub.h"
 #include "eosd.h"
 #include "mencoder.h"
 

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Wed Oct 27 18:48:21 2010	(r32545)
+++ trunk/mpcommon.c	Wed Oct 27 18:58:23 2010	(r32546)
@@ -36,7 +36,7 @@
 #include "mp_msg.h"
 #include "sub/spudec.h"
 #include "version.h"
-#include "vobsub.h"
+#include "sub/vobsub.h"
 #include "sub/av_sub.h"
 #include "libmpcodecs/dec_teletext.h"
 #include "libavutil/intreadwrite.h"

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Oct 27 18:48:21 2010	(r32545)
+++ trunk/mplayer.c	Wed Oct 27 18:58:23 2010	(r32546)
@@ -122,7 +122,7 @@
 #include "playtreeparser.h"
 #include "sub/spudec.h"
 #include "sub/subreader.h"
-#include "vobsub.h"
+#include "sub/vobsub.h"
 #include "eosd.h"
 #include "osdep/getch2.h"
 #include "osdep/timer.h"

Modified: trunk/sub/spudec.c
==============================================================================
--- trunk/sub/spudec.c	Wed Oct 27 18:48:21 2010	(r32545)
+++ trunk/sub/spudec.c	Wed Oct 27 18:58:23 2010	(r32546)
@@ -40,7 +40,7 @@
 #include "libvo/sub.h"
 #include "libvo/video_out.h"
 #include "sub/spudec.h"
-#include "vobsub.h"
+#include "sub/vobsub.h"
 #include "libavutil/avutil.h"
 #include "libavutil/intreadwrite.h"
 #include "libswscale/swscale.h"

Copied and modified: trunk/sub/unrar_exec.c (from r32541, trunk/unrar_exec.c)
==============================================================================
--- trunk/unrar_exec.c	Wed Oct 27 18:28:50 2010	(r32541, copy source)
+++ trunk/sub/unrar_exec.c	Wed Oct 27 18:58:23 2010	(r32546)
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <errno.h>
 #include <locale.h>
-#include "unrar_exec.h"
+#include "sub/unrar_exec.h"
 
 #include "mp_msg.h"
 

Copied and modified: trunk/sub/vobsub.c (from r32543, trunk/vobsub.c)
==============================================================================
--- trunk/vobsub.c	Wed Oct 27 18:38:51 2010	(r32543, copy source)
+++ trunk/sub/vobsub.c	Wed Oct 27 18:58:23 2010	(r32546)
@@ -33,10 +33,10 @@
 
 #include "config.h"
 #include "mpcommon.h"
-#include "vobsub.h"
+#include "sub/vobsub.h"
 #include "sub/spudec.h"
 #include "mp_msg.h"
-#include "unrar_exec.h"
+#include "sub/unrar_exec.h"
 #include "libavutil/common.h"
 
 // Record the original -vobsubid set by commandline, since vobsub_id will be


More information about the MPlayer-cvslog mailing list