Move vobsub.[ch] and unrar_exec.[ch] to the sub directory.
authorcigaes <cigaes@b3059339-0415-0410-9bf9-f77b7e298cf2>
Wed, 27 Oct 2010 16:58:23 +0000 (16:58 +0000)
committercigaes <cigaes@b3059339-0415-0410-9bf9-f77b7e298cf2>
Wed, 27 Oct 2010 16:58:23 +0000 (16:58 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@32546 b3059339-0415-0410-9bf9-f77b7e298cf2

13 files changed:
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 [moved from unrar_exec.c with 99% similarity]
sub/unrar_exec.h [moved from unrar_exec.h with 100% similarity]
sub/vobsub.c [moved from vobsub.c with 99% similarity]
sub/vobsub.h [moved from vobsub.h with 100% similarity]

index de09e8e..f06b336 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -278,7 +278,7 @@ SRCS_COMMON-$(TV_DSHOW)              += stream/tvi_dshow.c \
 
 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
 
index ba5bf13..fb9395c 100644 (file)
@@ -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 */
index 044783a..68fe377 100644 (file)
@@ -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[]={
index c5ee4be..fced778 100644 (file)
--- a/command.c
+++ b/command.c
@@ -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"
index 82b9279..e803baf 100644 (file)
@@ -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"
 
index 37130db..4e89847 100644 (file)
@@ -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"
 
index 79bf901..c694778 100644 (file)
@@ -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"
index 017faa7..2ce3099 100644 (file)
--- a/mplayer.c
+++ b/mplayer.c
 #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"
index a24576f..e93223e 100644 (file)
@@ -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"
similarity index 99%
rename from unrar_exec.c
rename to sub/unrar_exec.c
index 6de8c59..1eee806 100644 (file)
@@ -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"
 
similarity index 100%
rename from unrar_exec.h
rename to sub/unrar_exec.h
similarity index 99%
rename from vobsub.c
rename to sub/vobsub.c
index 3284824..1efffc4 100644 (file)
--- a/vobsub.c
 
 #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
similarity index 100%
rename from vobsub.h
rename to sub/vobsub.h