[MPlayer-cvslog] r32551 - in trunk/sub: ass_mp.c ass_mp.h av_sub.c eosd.c find_sub.c spudec.c sub_cc.c subassconvert.c subreader.c unrar_exec.c vobsub.c

[reimar]

Author: reimar
Date: Wed Oct 27 19:21:43 2010
New Revision: 32551

Log:
Do not use a path for including files in the same directory.

Modified:
   trunk/sub/ass_mp.c
   trunk/sub/ass_mp.h
   trunk/sub/av_sub.c
   trunk/sub/eosd.c
   trunk/sub/find_sub.c
   trunk/sub/spudec.c
   trunk/sub/sub_cc.c
   trunk/sub/subassconvert.c
   trunk/sub/subreader.c
   trunk/sub/unrar_exec.c
   trunk/sub/vobsub.c

Modified: trunk/sub/ass_mp.c
==============================================================================
--- trunk/sub/ass_mp.c	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/ass_mp.c	Wed Oct 27 19:21:43 2010	(r32551)
@@ -25,10 +25,10 @@
 #include "mp_msg.h"
 #include "mpcommon.h"
 #include "path.h"
-#include "sub/subreader.h"
+#include "subreader.h"
 
-#include "sub/ass_mp.h"
-#include "sub/eosd.h"
+#include "ass_mp.h"
+#include "eosd.h"
 #include "mpcommon.h"
 #include "libvo/sub.h"
 #include "help_mp.h"

Modified: trunk/sub/ass_mp.h
==============================================================================
--- trunk/sub/ass_mp.h	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/ass_mp.h	Wed Oct 27 19:21:43 2010	(r32551)
@@ -24,7 +24,7 @@
 #include "config.h"
 #include <stdint.h>
 
-#include "sub/subreader.h"
+#include "subreader.h"
 #if defined(CONFIG_ASS_INTERNAL) || !defined(CONFIG_ASS)
 #include "libass/ass.h"
 #else

Modified: trunk/sub/av_sub.c
==============================================================================
--- trunk/sub/av_sub.c	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/av_sub.c	Wed Oct 27 19:21:43 2010	(r32551)
@@ -19,8 +19,8 @@
 #include "libavcodec/avcodec.h"
 #include "libmpdemux/stheader.h"
 #include "libvo/sub.h"
-#include "sub/spudec.h"
-#include "sub/av_sub.h"
+#include "spudec.h"
+#include "av_sub.h"
 
 void reset_avsub(struct sh_sub *sh)
 {

Modified: trunk/sub/eosd.c
==============================================================================
--- trunk/sub/eosd.c	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/eosd.c	Wed Oct 27 19:21:43 2010	(r32551)
@@ -23,8 +23,8 @@
 #include "libmpcodecs/vf.h"
 #include "libvo/video_out.h"
 #include "libvo/sub.h"
-#include "sub/ass_mp.h"
-#include "sub/eosd.h"
+#include "ass_mp.h"
+#include "eosd.h"
 
 static struct mp_eosd_source *sources;
 static struct mp_eosd_settings settings;

Modified: trunk/sub/find_sub.c
==============================================================================
--- trunk/sub/find_sub.c	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/find_sub.c	Wed Oct 27 19:21:43 2010	(r32551)
@@ -24,7 +24,7 @@
 
 #include "libvo/video_out.h"
 #include "libvo/sub.h"
-#include "sub/subreader.h"
+#include "subreader.h"
 
 #include "mp_msg.h"
 #include "help_mp.h"

Modified: trunk/sub/spudec.c
==============================================================================
--- trunk/sub/spudec.c	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/spudec.c	Wed Oct 27 19:21:43 2010	(r32551)
@@ -39,8 +39,8 @@
 #include <math.h>
 #include "libvo/sub.h"
 #include "libvo/video_out.h"
-#include "sub/spudec.h"
-#include "sub/vobsub.h"
+#include "spudec.h"
+#include "vobsub.h"
 #include "libavutil/avutil.h"
 #include "libavutil/intreadwrite.h"
 #include "libswscale/swscale.h"

Modified: trunk/sub/sub_cc.c
==============================================================================
--- trunk/sub/sub_cc.c	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/sub_cc.c	Wed Oct 27 19:21:43 2010	(r32551)
@@ -33,9 +33,9 @@
 #include <string.h>
 
 #include "config.h"
-#include "sub/sub_cc.h"
+#include "sub_cc.h"
 
-#include "sub/subreader.h"
+#include "subreader.h"
 
 #include "libvo/video_out.h"
 #include "libvo/sub.h"

Modified: trunk/sub/subassconvert.c
==============================================================================
--- trunk/sub/subassconvert.c	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/subassconvert.c	Wed Oct 27 19:21:43 2010	(r32551)
@@ -27,7 +27,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "bstr.h"
-#include "sub/subassconvert.h"
+#include "subassconvert.h"
 #include "libavutil/common.h"
 
 struct line {

Modified: trunk/sub/subreader.c
==============================================================================
--- trunk/sub/subreader.c	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/subreader.c	Wed Oct 27 19:21:43 2010	(r32551)
@@ -29,12 +29,12 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#include "sub/ass_mp.h"
+#include "ass_mp.h"
 #include "config.h"
 #include "mp_msg.h"
 #include "mpcommon.h"
-#include "sub/subreader.h"
-#include "sub/subassconvert.h"
+#include "subreader.h"
+#include "subassconvert.h"
 #include "libvo/sub.h"
 #include "stream/stream.h"
 #include "libavutil/common.h"

Modified: trunk/sub/unrar_exec.c
==============================================================================
--- trunk/sub/unrar_exec.c	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/unrar_exec.c	Wed Oct 27 19:21:43 2010	(r32551)
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <errno.h>
 #include <locale.h>
-#include "sub/unrar_exec.h"
+#include "unrar_exec.h"
 
 #include "mp_msg.h"
 

Modified: trunk/sub/vobsub.c
==============================================================================
--- trunk/sub/vobsub.c	Wed Oct 27 19:13:54 2010	(r32550)
+++ trunk/sub/vobsub.c	Wed Oct 27 19:21:43 2010	(r32551)
@@ -33,10 +33,10 @@
 
 #include "config.h"
 #include "mpcommon.h"
-#include "sub/vobsub.h"
-#include "sub/spudec.h"
+#include "vobsub.h"
+#include "spudec.h"
 #include "mp_msg.h"
-#include "sub/unrar_exec.h"
+#include "unrar_exec.h"
 #include "libavutil/common.h"
 
 // Record the original -vobsubid set by commandline, since vobsub_id will be