summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-30 12:22:21 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-30 12:22:21 +0000
commit97e5f304ce0e3693f72f44710e6d86e5f323bead (patch)
tree62f483b6ad9b4f68e10e8d33fd59a85e1ff05c04 /stream
parentfd75ca0c6a041d4ee820f25b777b3649a191e71e (diff)
downloadmpv-97e5f304ce0e3693f72f44710e6d86e5f323bead.tar.bz2
mpv-97e5f304ce0e3693f72f44710e6d86e5f323bead.tar.xz
Rename internal libdvdread fork from dvdread to libdvdread
to avoid clashing with external libdvdread. (Sync with libdvdread r1122) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_dvd.h16
-rw-r--r--stream/stream_dvd_common.c4
-rw-r--r--stream/stream_dvd_common.h4
3 files changed, 12 insertions, 12 deletions
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index 3532646dbb..9196ef04e0 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -4,15 +4,15 @@
#include "config.h"
#include <stdint.h>
#ifdef CONFIG_DVDREAD_INTERNAL
-#include "dvdread/dvd_reader.h"
-#include "dvdread/ifo_types.h"
-#include "dvdread/ifo_read.h"
-#include "dvdread/nav_read.h"
+#include "libdvdread/dvd_reader.h"
+#include "libdvdread/ifo_types.h"
+#include "libdvdread/ifo_read.h"
+#include "libdvdread/nav_read.h"
#else
-#include <libdvdread/dvd_reader.h>
-#include <libdvdread/ifo_types.h>
-#include <libdvdread/ifo_read.h>
-#include <libdvdread/nav_read.h>
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
#endif
#include "stream.h"
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index ffaf1d490c..e2cf3690ba 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -1,9 +1,9 @@
#include "config.h"
#include <inttypes.h>
#ifdef CONFIG_DVDREAD_INTERNAL
-#include <dvdread/ifo_types.h>
+#include "libdvdread/ifo_types.h"
#else
-#include <libdvdread/ifo_types.h>
+#include <dvdread/ifo_types.h>
#endif
#include "stream_dvd_common.h"
diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h
index 5d7953571d..c79492e061 100644
--- a/stream/stream_dvd_common.h
+++ b/stream/stream_dvd_common.h
@@ -4,9 +4,9 @@
#include "config.h"
#include <inttypes.h>
#ifdef CONFIG_DVDREAD_INTERNAL
-#include <dvdread/ifo_types.h>
+#include "libdvdread/ifo_types.h"
#else
-#include <libdvdread/ifo_types.h>
+#include <dvdread/ifo_types.h>
#endif
int mp_dvdtimetomsec(dvd_time_t *dt);