You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
44 lines
2.1 KiB
44 lines
2.1 KiB
diff -up mplayer-export-2009-03-29/configure.nodvdcss mplayer-export-2009-03-29/configure
|
|
--- mplayer-export-2009-03-29/configure.nodvdcss 2009-03-29 00:21:21.000000000 +0100
|
|
+++ mplayer-export-2009-03-29/configure 2009-03-29 11:20:11.000000000 +0200
|
|
@@ -622,7 +622,7 @@ _dvdnavconfig=dvdnav-config
|
|
_dvdreadconfig=dvdread-config
|
|
_dvdread=auto
|
|
_dvdread_internal=auto
|
|
-_libdvdcss_internal=auto
|
|
+_libdvdcss_internal=no
|
|
_xanim=auto
|
|
_real=auto
|
|
_live=auto
|
|
diff -up mplayer-export-2009-03-29/Makefile.nodvdcss mplayer-export-2009-03-29/Makefile
|
|
--- mplayer-export-2009-03-29/Makefile.nodvdcss 2009-03-29 11:20:11.000000000 +0200
|
|
+++ mplayer-export-2009-03-29/Makefile 2009-03-29 11:20:55.000000000 +0200
|
|
@@ -345,11 +345,6 @@ SRCS_COMMON-$(LIBDCA) +=
|
|
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
|
|
libmpcodecs/vd_libdv.c \
|
|
libmpdemux/demux_rawdv.c
|
|
-SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
|
|
- libdvdcss/device.c \
|
|
- libdvdcss/error.c \
|
|
- libdvdcss/ioctl.c \
|
|
- libdvdcss/libdvdcss.c \
|
|
|
|
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
|
|
SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
|
|
@@ -745,7 +740,6 @@ DIRS = . \
|
|
libavcodec/x86 \
|
|
libavformat \
|
|
libavutil \
|
|
- libdvdcss \
|
|
libdvdnav \
|
|
libdvdnav/vm \
|
|
libdvdread4 \
|
|
@@ -852,7 +846,6 @@ version.h: version.sh
|
|
# Make sure all generated header files are created.
|
|
$(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): codecs.conf.h help_mp.h version.h
|
|
|
|
-libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS)
|
|
libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\"
|
|
libdvdnav/% stream/stream_dvdnav%: CFLAGS += $(CFLAGS_LIBDVDNAV)
|
|
libdvdread4/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
|