diff options
| -rw-r--r-- | Copyright | 2 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | TOOLS/netstream/Makefile | 2 | ||||
| -rw-r--r-- | dvdread/Makefile (renamed from libdvdread/Makefile) | 0 | ||||
| -rw-r--r-- | dvdread/bswap.h (renamed from libdvdread/bswap.h) | 0 | ||||
| -rw-r--r-- | dvdread/dvd_input.c (renamed from libdvdread/dvd_input.c) | 0 | ||||
| -rw-r--r-- | dvdread/dvd_input.h (renamed from libdvdread/dvd_input.h) | 0 | ||||
| -rw-r--r-- | dvdread/dvd_reader.c (renamed from libdvdread/dvd_reader.c) | 0 | ||||
| -rw-r--r-- | dvdread/dvd_reader.h (renamed from libdvdread/dvd_reader.h) | 0 | ||||
| -rw-r--r-- | dvdread/dvd_udf.c (renamed from libdvdread/dvd_udf.c) | 0 | ||||
| -rw-r--r-- | dvdread/dvd_udf.h (renamed from libdvdread/dvd_udf.h) | 0 | ||||
| -rw-r--r-- | dvdread/dvdread_internal.h (renamed from libdvdread/dvdread_internal.h) | 0 | ||||
| -rw-r--r-- | dvdread/ifo_print.c (renamed from libdvdread/ifo_print.c) | 0 | ||||
| -rw-r--r-- | dvdread/ifo_print.h (renamed from libdvdread/ifo_print.h) | 0 | ||||
| -rw-r--r-- | dvdread/ifo_read.c (renamed from libdvdread/ifo_read.c) | 0 | ||||
| -rw-r--r-- | dvdread/ifo_read.h (renamed from libdvdread/ifo_read.h) | 0 | ||||
| -rw-r--r-- | dvdread/ifo_types.h (renamed from libdvdread/ifo_types.h) | 0 | ||||
| -rw-r--r-- | dvdread/libdvdread_changes.diff (renamed from libdvdread/libdvdread_changes.diff) | 0 | ||||
| -rw-r--r-- | dvdread/md5.c (renamed from libdvdread/md5.c) | 0 | ||||
| -rw-r--r-- | dvdread/md5.h (renamed from libdvdread/md5.h) | 0 | ||||
| -rw-r--r-- | dvdread/nav_print.c (renamed from libdvdread/nav_print.c) | 0 | ||||
| -rw-r--r-- | dvdread/nav_print.h (renamed from libdvdread/nav_print.h) | 0 | ||||
| -rw-r--r-- | dvdread/nav_read.c (renamed from libdvdread/nav_read.c) | 0 | ||||
| -rw-r--r-- | dvdread/nav_read.h (renamed from libdvdread/nav_read.h) | 0 | ||||
| -rw-r--r-- | dvdread/nav_types.h (renamed from libdvdread/nav_types.h) | 0 | ||||
| -rw-r--r-- | stream/stream_dvd.h | 8 |
26 files changed, 12 insertions, 12 deletions
@@ -58,7 +58,7 @@ License: GNU General Public License Name: libdvdread Version: 0.9.4 + patches Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml -Directory: libdvdread +Directory: dvdread Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com> 1999 Christian Wolff for convergence integrated media 2000-2001 Billy Biggs <vektor@dumbterm.net>, @@ -112,7 +112,7 @@ ifeq ($(VIDIX),yes) PARTS += libdha vidix endif ifeq ($(DVDREAD_INTERNAL),yes) -PARTS += libdvdread +PARTS += dvdread PARTS += libdvdcss endif ifeq ($(GUI),yes) @@ -168,8 +168,8 @@ ifeq ($(VIDIX),yes) COMMON_DEPS += libdha/libdha.so vidix/libvidix.a endif ifeq ($(DVDREAD_INTERNAL),yes) -COMMON_DEPS += libdvdread/libdvdread.a -COMMON_LIBS += libdvdread/libdvdread.a +COMMON_DEPS += dvdread/libdvdread.a +COMMON_LIBS += dvdread/libdvdread.a COMMON_DEPS += libdvdcss/libdvdcss.a COMMON_LIBS += libdvdcss/libdvdcss.a endif @@ -201,8 +201,8 @@ all: $(ALL_PRG) libaf/libaf.a: $(MAKE) -C libaf -libdvdread/libdvdread.a: - $(MAKE) -C libdvdread +dvdread/libdvdread.a: + $(MAKE) -C dvdread libdvdcss/libdvdcss.a: $(MAKE) -C libdvdcss @@ -476,7 +476,7 @@ input/libinput.a: .norecurse $(wildcard input/*.[ch]) libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch]) libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch]) -libdvdread/libdvdread.a: .norecurse $(wildcard libdvdread/*.[ch]) +dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch]) libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch]) libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch]) diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile index ad062f0c51..27996d2383 100644 --- a/TOOLS/netstream/Makefile +++ b/TOOLS/netstream/Makefile @@ -20,7 +20,7 @@ all: netstream # it does not work with either GUI, LIVE555 or libavformat enabled DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \ $(MPROOT)/stream/stream.a \ - $(MPROOT)/libdvdread/libdvdread.a \ + $(MPROOT)/dvdread/libdvdread.a \ $(MPROOT)/libmpcodecs/native/minilzo.o \ $(MPROOT)/libvo/aclib.o \ $(MPROOT)/libmpcodecs/img_format.o \ diff --git a/libdvdread/Makefile b/dvdread/Makefile index 3db80769b5..3db80769b5 100644 --- a/libdvdread/Makefile +++ b/dvdread/Makefile diff --git a/libdvdread/bswap.h b/dvdread/bswap.h index a30061b323..a30061b323 100644 --- a/libdvdread/bswap.h +++ b/dvdread/bswap.h diff --git a/libdvdread/dvd_input.c b/dvdread/dvd_input.c index 8478970a6d..8478970a6d 100644 --- a/libdvdread/dvd_input.c +++ b/dvdread/dvd_input.c diff --git a/libdvdread/dvd_input.h b/dvdread/dvd_input.h index e9e84917ea..e9e84917ea 100644 --- a/libdvdread/dvd_input.h +++ b/dvdread/dvd_input.h diff --git a/libdvdread/dvd_reader.c b/dvdread/dvd_reader.c index d944696c15..d944696c15 100644 --- a/libdvdread/dvd_reader.c +++ b/dvdread/dvd_reader.c diff --git a/libdvdread/dvd_reader.h b/dvdread/dvd_reader.h index cc4ba54895..cc4ba54895 100644 --- a/libdvdread/dvd_reader.h +++ b/dvdread/dvd_reader.h diff --git a/libdvdread/dvd_udf.c b/dvdread/dvd_udf.c index 56682e7405..56682e7405 100644 --- a/libdvdread/dvd_udf.c +++ b/dvdread/dvd_udf.c diff --git a/libdvdread/dvd_udf.h b/dvdread/dvd_udf.h index b600983d9a..b600983d9a 100644 --- a/libdvdread/dvd_udf.h +++ b/dvdread/dvd_udf.h diff --git a/libdvdread/dvdread_internal.h b/dvdread/dvdread_internal.h index 5c8a535cc0..5c8a535cc0 100644 --- a/libdvdread/dvdread_internal.h +++ b/dvdread/dvdread_internal.h diff --git a/libdvdread/ifo_print.c b/dvdread/ifo_print.c index 17820c77a4..17820c77a4 100644 --- a/libdvdread/ifo_print.c +++ b/dvdread/ifo_print.c diff --git a/libdvdread/ifo_print.h b/dvdread/ifo_print.h index c6e24f6a74..c6e24f6a74 100644 --- a/libdvdread/ifo_print.h +++ b/dvdread/ifo_print.h diff --git a/libdvdread/ifo_read.c b/dvdread/ifo_read.c index 8ad7baeea1..8ad7baeea1 100644 --- a/libdvdread/ifo_read.c +++ b/dvdread/ifo_read.c diff --git a/libdvdread/ifo_read.h b/dvdread/ifo_read.h index d64f6e712c..d64f6e712c 100644 --- a/libdvdread/ifo_read.h +++ b/dvdread/ifo_read.h diff --git a/libdvdread/ifo_types.h b/dvdread/ifo_types.h index 4eb6144e1c..4eb6144e1c 100644 --- a/libdvdread/ifo_types.h +++ b/dvdread/ifo_types.h diff --git a/libdvdread/libdvdread_changes.diff b/dvdread/libdvdread_changes.diff index ab3ab92b73..ab3ab92b73 100644 --- a/libdvdread/libdvdread_changes.diff +++ b/dvdread/libdvdread_changes.diff diff --git a/libdvdread/md5.c b/dvdread/md5.c index d4fd7d5e20..d4fd7d5e20 100644 --- a/libdvdread/md5.c +++ b/dvdread/md5.c diff --git a/libdvdread/md5.h b/dvdread/md5.h index 3b7dea1699..3b7dea1699 100644 --- a/libdvdread/md5.h +++ b/dvdread/md5.h diff --git a/libdvdread/nav_print.c b/dvdread/nav_print.c index 6df3dc8310..6df3dc8310 100644 --- a/libdvdread/nav_print.c +++ b/dvdread/nav_print.c diff --git a/libdvdread/nav_print.h b/dvdread/nav_print.h index 3a3354277f..3a3354277f 100644 --- a/libdvdread/nav_print.h +++ b/dvdread/nav_print.h diff --git a/libdvdread/nav_read.c b/dvdread/nav_read.c index 1a907f9dfe..1a907f9dfe 100644 --- a/libdvdread/nav_read.c +++ b/dvdread/nav_read.c diff --git a/libdvdread/nav_read.h b/dvdread/nav_read.h index 88c46d93bc..88c46d93bc 100644 --- a/libdvdread/nav_read.h +++ b/dvdread/nav_read.h diff --git a/libdvdread/nav_types.h b/dvdread/nav_types.h index 8800e7f894..8800e7f894 100644 --- a/libdvdread/nav_types.h +++ b/dvdread/nav_types.h diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h index 3f9b2ffddb..d790bc078c 100644 --- a/stream/stream_dvd.h +++ b/stream/stream_dvd.h @@ -2,10 +2,10 @@ #ifdef USE_DVDREAD #ifdef USE_DVDREAD_INTERNAL -#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" #elif defined(USE_DVDNAV) #include <dvd_reader.h> #include <ifo_types.h> |