mirror of https://github.com/mpv-player/mpv
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:
parent
fd75ca0c6a
commit
97e5f304ce
|
@ -51,7 +51,7 @@ License: GNU General Public License
|
||||||
Name: libdvdread
|
Name: libdvdread
|
||||||
Version: 0.9.7 + patches
|
Version: 0.9.7 + patches
|
||||||
Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml
|
Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml
|
||||||
Directory: dvdread
|
Directory: libdvdread
|
||||||
Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com>
|
Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com>
|
||||||
1999 Christian Wolff for convergence integrated media
|
1999 Christian Wolff for convergence integrated media
|
||||||
2000-2001 Billy Biggs <vektor@dumbterm.net>,
|
2000-2001 Billy Biggs <vektor@dumbterm.net>,
|
||||||
|
|
22
Makefile
22
Makefile
|
@ -236,15 +236,15 @@ SRCS_COMMON-$(DVBIN) += stream/dvb_tune.c \
|
||||||
SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c
|
SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c
|
||||||
SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \
|
SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \
|
||||||
stream/stream_dvd_common.c
|
stream/stream_dvd_common.c
|
||||||
SRCS_COMMON-$(DVDREAD_INTERNAL) += dvdread/cmd_print.c \
|
SRCS_COMMON-$(DVDREAD_INTERNAL) += libdvdread/cmd_print.c \
|
||||||
dvdread/dvd_input.c \
|
libdvdread/dvd_input.c \
|
||||||
dvdread/dvd_reader.c \
|
libdvdread/dvd_reader.c \
|
||||||
dvdread/dvd_udf.c \
|
libdvdread/dvd_udf.c \
|
||||||
dvdread/ifo_print.c \
|
libdvdread/ifo_print.c \
|
||||||
dvdread/ifo_read.c \
|
libdvdread/ifo_read.c \
|
||||||
dvdread/md5.c \
|
libdvdread/md5.c \
|
||||||
dvdread/nav_print.c \
|
libdvdread/nav_print.c \
|
||||||
dvdread/nav_read.c \
|
libdvdread/nav_read.c \
|
||||||
|
|
||||||
SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c
|
SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c
|
||||||
SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.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
|
INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man
|
||||||
|
|
||||||
DIRS = . \
|
DIRS = . \
|
||||||
dvdread \
|
|
||||||
gui \
|
gui \
|
||||||
gui/mplayer \
|
gui/mplayer \
|
||||||
gui/mplayer/gtk \
|
gui/mplayer/gtk \
|
||||||
|
@ -679,6 +678,7 @@ DIRS = . \
|
||||||
libavformat \
|
libavformat \
|
||||||
libavutil \
|
libavutil \
|
||||||
libdvdcss \
|
libdvdcss \
|
||||||
|
libdvdread \
|
||||||
libfaad2 \
|
libfaad2 \
|
||||||
libmenu \
|
libmenu \
|
||||||
libmpcodecs \
|
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
|
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
|
$(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)
|
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)
|
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)
|
loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
|
||||||
|
|
|
@ -5475,10 +5475,10 @@ elif test "$_dvdread" = auto ; then
|
||||||
if test "$_dl" = yes; then
|
if test "$_dl" = yes; then
|
||||||
cat > $TMPC << EOF
|
cat > $TMPC << EOF
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <libdvdread/dvd_reader.h>
|
#include <dvdread/dvd_reader.h>
|
||||||
#include <libdvdread/ifo_types.h>
|
#include <dvdread/ifo_types.h>
|
||||||
#include <libdvdread/ifo_read.h>
|
#include <dvdread/ifo_read.h>
|
||||||
#include <libdvdread/nav_read.h>
|
#include <dvdread/nav_read.h>
|
||||||
int main(void) { return 0; }
|
int main(void) { return 0; }
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* 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).
|
* Pretty printing of the DVD commands (vm instructions).
|
|
@ -21,8 +21,8 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <dvdread/ifo_types.h>
|
#include <libdvdread/ifo_types.h>
|
||||||
#include <dvdread/dvd_reader.h>
|
#include <libdvdread/dvd_reader.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
|
@ -21,8 +21,8 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <dvdread/ifo_types.h>
|
#include <libdvdread/ifo_types.h>
|
||||||
#include <dvdread/dvd_reader.h>
|
#include <libdvdread/dvd_reader.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
|
@ -25,7 +25,7 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* 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(__BEOS__)
|
||||||
#if !defined(_INTTYPES_H_) && !defined(_INTTYPES_H) && !defined(_STDINT_H_) && !defined(_STDINT_H)
|
#if !defined(_INTTYPES_H_) && !defined(_INTTYPES_H) && !defined(_STDINT_H_) && !defined(_STDINT_H)
|
|
@ -21,7 +21,7 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* 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.
|
* Pretty printing of the NAV packets, PCI and DSI structs.
|
|
@ -20,7 +20,7 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* 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.
|
* Parsing of NAV data, PCI and DSI parts.
|
|
@ -30,7 +30,7 @@
|
||||||
* USA
|
* 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. */
|
/* If it's ever removed add a uintX_t test. */
|
||||||
|
|
||||||
#undef ATTRIBUTE_PACKED
|
#undef ATTRIBUTE_PACKED
|
|
@ -4,15 +4,15 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#ifdef CONFIG_DVDREAD_INTERNAL
|
#ifdef CONFIG_DVDREAD_INTERNAL
|
||||||
#include "dvdread/dvd_reader.h"
|
#include "libdvdread/dvd_reader.h"
|
||||||
#include "dvdread/ifo_types.h"
|
#include "libdvdread/ifo_types.h"
|
||||||
#include "dvdread/ifo_read.h"
|
#include "libdvdread/ifo_read.h"
|
||||||
#include "dvdread/nav_read.h"
|
#include "libdvdread/nav_read.h"
|
||||||
#else
|
#else
|
||||||
#include <libdvdread/dvd_reader.h>
|
#include <dvdread/dvd_reader.h>
|
||||||
#include <libdvdread/ifo_types.h>
|
#include <dvdread/ifo_types.h>
|
||||||
#include <libdvdread/ifo_read.h>
|
#include <dvdread/ifo_read.h>
|
||||||
#include <libdvdread/nav_read.h>
|
#include <dvdread/nav_read.h>
|
||||||
#endif
|
#endif
|
||||||
#include "stream.h"
|
#include "stream.h"
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#ifdef CONFIG_DVDREAD_INTERNAL
|
#ifdef CONFIG_DVDREAD_INTERNAL
|
||||||
#include <dvdread/ifo_types.h>
|
#include "libdvdread/ifo_types.h"
|
||||||
#else
|
#else
|
||||||
#include <libdvdread/ifo_types.h>
|
#include <dvdread/ifo_types.h>
|
||||||
#endif
|
#endif
|
||||||
#include "stream_dvd_common.h"
|
#include "stream_dvd_common.h"
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#ifdef CONFIG_DVDREAD_INTERNAL
|
#ifdef CONFIG_DVDREAD_INTERNAL
|
||||||
#include <dvdread/ifo_types.h>
|
#include "libdvdread/ifo_types.h"
|
||||||
#else
|
#else
|
||||||
#include <libdvdread/ifo_types.h>
|
#include <dvdread/ifo_types.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int mp_dvdtimetomsec(dvd_time_t *dt);
|
int mp_dvdtimetomsec(dvd_time_t *dt);
|
||||||
|
|
Loading…
Reference in New Issue