29 files changed, 37 insertions, 37 deletions
diff --git a/Copyright b/Copyright
index 9f22139328..3589e06be9 100644
--- a/Copyright
+++ b/Copyright
@@ -51,7 +51,7 @@ License:    GNU General Public License
 Name:       libdvdread
 Version:    0.9.7 + patches
 Homepage:   http://www.dtek.chalmers.se/groups/dvd/development.shtml
-Directory:  dvdread
+Directory:  libdvdread
 Copyright:  1998, 1999 Eric Smith <eric@brouhaha.com>
             1999 Christian Wolff for convergence integrated media
             2000-2001 Billy Biggs <vektor@dumbterm.net>,
diff --git a/Makefile b/Makefile
index 3e85209212..bdf3705935 100644
--- a/Makefile
+++ b/Makefile
@@ -236,15 +236,15 @@ SRCS_COMMON-$(DVBIN)                 += stream/dvb_tune.c \
 SRCS_COMMON-$(DVDNAV)                += stream/stream_dvdnav.c
 SRCS_COMMON-$(DVDREAD)               += stream/stream_dvd.c \
                                         stream/stream_dvd_common.c
-SRCS_COMMON-$(DVDREAD_INTERNAL)      += dvdread/cmd_print.c \
-                                        dvdread/dvd_input.c \
-                                        dvdread/dvd_reader.c \
-                                        dvdread/dvd_udf.c \
-                                        dvdread/ifo_print.c \
-                                        dvdread/ifo_read.c \
-                                        dvdread/md5.c \
-                                        dvdread/nav_print.c \
-                                        dvdread/nav_read.c \
+SRCS_COMMON-$(DVDREAD_INTERNAL)      += libdvdread/cmd_print.c \
+                                        libdvdread/dvd_input.c \
+                                        libdvdread/dvd_reader.c \
+                                        libdvdread/dvd_udf.c \
+                                        libdvdread/ifo_print.c \
+                                        libdvdread/ifo_read.c \
+                                        libdvdread/md5.c \
+                                        libdvdread/nav_print.c \
+                                        libdvdread/nav_read.c \
 
 SRCS_COMMON-$(FAAD)                  += libmpcodecs/ad_faad.c
 SRCS_COMMON-$(FAAD_INTERNAL)         += libfaad2/bits.c \
@@ -655,7 +655,6 @@ INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man
 INSTALL_TARGETS-$(MPLAYER)  += install-mplayer  install-mplayer-man
 
 DIRS =  . \
-        dvdread \
         gui \
         gui/mplayer \
         gui/mplayer/gtk \
@@ -679,6 +678,7 @@ DIRS =  . \
         libavformat \
         libavutil \
         libdvdcss \
+        libdvdread \
         libfaad2 \
         libmenu \
         libmpcodecs \
@@ -783,8 +783,8 @@ codec-cfg.d: codecs.conf.h
 mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h
 $(DEPS): help_mp.h
 
-dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
+libdvdread/%.o libdvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
 
 loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
diff --git a/configure b/configure
index 997d5aa3be..6e344ebc96 100755
--- a/configure
+++ b/configure
@@ -5475,10 +5475,10 @@ elif test "$_dvdread" = auto ; then
   if test "$_dl" = yes; then
     cat > $TMPC << EOF
 #include <inttypes.h>
-#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>
 int main(void) { return 0; }
 EOF
   fi
diff --git a/dvdread/bswap.h b/libdvdread/bswap.h
index 92afd07c88..92afd07c88 100644
--- a/dvdread/bswap.h
+++ b/libdvdread/bswap.h
diff --git a/dvdread/cmd_print.c b/libdvdread/cmd_print.c
index fd3bdc1382..fd3bdc1382 100644
--- a/dvdread/cmd_print.c
+++ b/libdvdread/cmd_print.c
diff --git a/dvdread/cmd_print.h b/libdvdread/cmd_print.h
index 92c746cec3..0f1ee74ddb 100644
--- a/dvdread/cmd_print.h
+++ b/libdvdread/cmd_print.h
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/ifo_types.h>
+#include <libdvdread/ifo_types.h>
 
 /**
  * Pretty printing of the DVD commands (vm instructions).
diff --git a/dvdread/dvd_input.c b/libdvdread/dvd_input.c
index 35359821bd..35359821bd 100644
--- a/dvdread/dvd_input.c
+++ b/libdvdread/dvd_input.c
diff --git a/dvdread/dvd_input.h b/libdvdread/dvd_input.h
index 607619e2d0..607619e2d0 100644
--- a/dvdread/dvd_input.h
+++ b/libdvdread/dvd_input.h
diff --git a/dvdread/dvd_reader.c b/libdvdread/dvd_reader.c
index 49140544e4..49140544e4 100644
--- a/dvdread/dvd_reader.c
+++ b/libdvdread/dvd_reader.c
diff --git a/dvdread/dvd_reader.h b/libdvdread/dvd_reader.h
index 17ab52a694..17ab52a694 100644
--- a/dvdread/dvd_reader.h
+++ b/libdvdread/dvd_reader.h
diff --git a/dvdread/dvd_udf.c b/libdvdread/dvd_udf.c
index 0e31c36552..0e31c36552 100644
--- a/dvdread/dvd_udf.c
+++ b/libdvdread/dvd_udf.c
diff --git a/dvdread/dvd_udf.h b/libdvdread/dvd_udf.h
index 5005ed6398..5005ed6398 100644
--- a/dvdread/dvd_udf.h
+++ b/libdvdread/dvd_udf.h
diff --git a/dvdread/dvdread_internal.h b/libdvdread/dvdread_internal.h
index 47a0efe854..47a0efe854 100644
--- a/dvdread/dvdread_internal.h
+++ b/libdvdread/dvdread_internal.h
diff --git a/dvdread/ifo_print.c b/libdvdread/ifo_print.c
index 39ad59efcf..39ad59efcf 100644
--- a/dvdread/ifo_print.c
+++ b/libdvdread/ifo_print.c
diff --git a/dvdread/ifo_print.h b/libdvdread/ifo_print.h
index 514208f99f..f50e764ba9 100644
--- a/dvdread/ifo_print.h
+++ b/libdvdread/ifo_print.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/ifo_types.h>
+#include <libdvdread/dvd_reader.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dvdread/ifo_read.c b/libdvdread/ifo_read.c
index 2a430661b7..2a430661b7 100644
--- a/dvdread/ifo_read.c
+++ b/libdvdread/ifo_read.c
diff --git a/dvdread/ifo_read.h b/libdvdread/ifo_read.h
index 202fedce50..8a46b78e0e 100644
--- a/dvdread/ifo_read.h
+++ b/libdvdread/ifo_read.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/ifo_types.h>
+#include <libdvdread/dvd_reader.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dvdread/ifo_types.h b/libdvdread/ifo_types.h
index 01972f4ed6..7edf64d9f7 100644
--- a/dvdread/ifo_types.h
+++ b/libdvdread/ifo_types.h
@@ -25,7 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/dvd_reader.h>
 
 #if defined(__BEOS__)
 #if !defined(_INTTYPES_H_) && !defined(_INTTYPES_H) && !defined(_STDINT_H_) && !defined(_STDINT_H)
diff --git a/dvdread/libdvdread_changes.diff b/libdvdread/libdvdread_changes.diff
index f0177aa5e5..f0177aa5e5 100644
--- a/dvdread/libdvdread_changes.diff
+++ b/libdvdread/libdvdread_changes.diff
diff --git a/dvdread/md5.c b/libdvdread/md5.c
index 72bc36fa64..72bc36fa64 100644
--- a/dvdread/md5.c
+++ b/libdvdread/md5.c
diff --git a/dvdread/md5.h b/libdvdread/md5.h
index 345361a8f2..345361a8f2 100644
--- a/dvdread/md5.h
+++ b/libdvdread/md5.h
diff --git a/dvdread/nav_print.c b/libdvdread/nav_print.c
index 8b1db1c54c..8b1db1c54c 100644
--- a/dvdread/nav_print.c
+++ b/libdvdread/nav_print.c
diff --git a/dvdread/nav_print.h b/libdvdread/nav_print.h
index 0cef79f551..b01e82ba56 100644
--- a/dvdread/nav_print.h
+++ b/libdvdread/nav_print.h
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/nav_types.h>
+#include <libdvdread/nav_types.h>
 
 /**
  * Pretty printing of the NAV packets, PCI and DSI structs.
diff --git a/dvdread/nav_read.c b/libdvdread/nav_read.c
index 9ba685bdca..9ba685bdca 100644
--- a/dvdread/nav_read.c
+++ b/libdvdread/nav_read.c
diff --git a/dvdread/nav_read.h b/libdvdread/nav_read.h
index eb5d2ae552..afbff978d5 100644
--- a/dvdread/nav_read.h
+++ b/libdvdread/nav_read.h
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/nav_types.h>
+#include <libdvdread/nav_types.h>
 
 /**
  * Parsing of NAV data, PCI and DSI parts.
diff --git a/dvdread/nav_types.h b/libdvdread/nav_types.h
index 3b80097489..b320a90205 100644
--- a/dvdread/nav_types.h
+++ b/libdvdread/nav_types.h
@@ -30,7 +30,7 @@
  * USA
  */
 
-#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
+#include <libdvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
 /* If it's ever removed add a uintX_t test. */
 
 #undef ATTRIBUTE_PACKED
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);