RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
rathann 2008-08-30 12:22:21 +00:00
parent fd75ca0c6a
commit 97e5f304ce
29 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Copyright
View File

@ -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>,

22
Makefile
View File

@ -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)

8
configure vendored
View File

@ -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

0
dvdread/bswap.h → libdvdread/bswap.h
View File

0
dvdread/cmd_print.c → libdvdread/cmd_print.c
View File

2
dvdread/cmd_print.h → libdvdread/cmd_print.h
View File

@ -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).

0
dvdread/dvd_input.c → libdvdread/dvd_input.c
View File

0
dvdread/dvd_input.h → libdvdread/dvd_input.h
View File

0
dvdread/dvd_reader.c → libdvdread/dvd_reader.c
View File

0
dvdread/dvd_reader.h → libdvdread/dvd_reader.h
View File

0
dvdread/dvd_udf.c → libdvdread/dvd_udf.c
View File

0
dvdread/dvd_udf.h → libdvdread/dvd_udf.h
View File

0
dvdread/dvdread_internal.h → libdvdread/dvdread_internal.h
View File

0
dvdread/ifo_print.c → libdvdread/ifo_print.c
View File

4
dvdread/ifo_print.h → libdvdread/ifo_print.h
View File

@ -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" {

0
dvdread/ifo_read.c → libdvdread/ifo_read.c
View File

4
dvdread/ifo_read.h → libdvdread/ifo_read.h
View File

@ -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" {

2
dvdread/ifo_types.h → libdvdread/ifo_types.h
View File

@ -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)

0
dvdread/libdvdread_changes.diff → libdvdread/libdvdread_changes.diff
View File

0
dvdread/md5.c → libdvdread/md5.c
View File

0
dvdread/md5.h → libdvdread/md5.h
View File

0
dvdread/nav_print.c → libdvdread/nav_print.c
View File

2
dvdread/nav_print.h → libdvdread/nav_print.h
View File

@ -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.

0
dvdread/nav_read.c → libdvdread/nav_read.c
View File

2
dvdread/nav_read.h → libdvdread/nav_read.h
View File

@ -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.

2
dvdread/nav_types.h → libdvdread/nav_types.h
View File

@ -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

16
stream/stream_dvd.h
View File

@ -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"

4
stream/stream_dvd_common.c
View File

@ -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"

4
stream/stream_dvd_common.h
View File

@ -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);