path: root/old-configure
diff options
authorwm4 <wm4@nowhere>2013-12-12 01:44:28 +0100
committerwm4 <wm4@nowhere>2013-12-12 01:46:45 +0100
commit053044741713eddc4aea024fb0c175aa01fc092d (patch)
treebdf12e75b406696c19519649a4ba32d0e170e8f0 /old-configure
parent76ce5434b2716abf063b6d581fe2930825cdecab (diff)
Add prelimimary (basic, possibly broken) dvdnav support
This readds a more or less completely new dvdnav implementation, though it's based on the code from before commit 41fbcee. Note that this is rather basic, and might be broken or not quite usable in many cases. Most importantly, navigation highlights are not correctly implemented. This would require changes in the FFmpeg dvdsub decoder (to apply a different internal CLUT), so supporting it is not really possible right now. And in fact, I don't think I ever want to support it, because it's a very small gain for a lot of work. Instead, mpv will display fake highlights, which are an approximate bounding box around the real highlights. Some things like mouse input or switching audio/subtitles stream using the dvdnav VM are not supported. Might be quite fragile on transitions: if dvdnav initiates a transition, and doesn't give us enough mpeg data to initialize video playback, the player will just quit. This is added only because some users seem to want it. I don't intend to make mpv a good DVD player, so the very basic minimum will have to do. How about you just convert your DVD to proper video files?
Diffstat (limited to 'old-configure')
1 files changed, 21 insertions, 0 deletions
diff --git a/old-configure b/old-configure
index 45e7add61b..63eaf1fd03 100755
--- a/old-configure
+++ b/old-configure
@@ -319,6 +319,7 @@ Optional features:
--disable-vcd disable VCD support [autodetect]
--disable-bluray disable Blu-ray support [autodetect]
--disable-dvdread disable libdvdread [autodetect]
+ --disable-dvdnav disable libdvdnav [autodetect]
--disable-enca disable ENCA charset oracle library [autodetect]
--disable-pthreads disable Posix threads support [autodetect]
--disable-libass disable subtitle rendering with libass [autodetect]
@@ -451,6 +452,7 @@ _libbs2b=auto
@@ -639,6 +641,8 @@ for ac_option do
--disable-bluray) _bluray=no ;;
--enable-dvdread) _dvdread=yes ;;
--disable-dvdread) _dvdread=no ;;
+ --enable-dvdnav) _dvdnav=yes ;;
+ --disable-dvdnav) _dvdnav=no ;;
--enable-lcms2) _lcms2=yes ;;
--disable-lcms2) _lcms2=no ;;
--enable-xinerama) _xinerama=yes ;;
@@ -2467,6 +2471,21 @@ fi
echores "$_dvdread"
+echocheck "dvdnav"
+if test "$_dvdnav" = auto ; then
+ _dvdnav=no
+ pkg_config_add 'dvdnav >= 4.2.0' && _dvdnav=yes
+if test "$_dvdnav" = yes ; then
+ def_dvdnav='#define HAVE_DVDNAV 1'
+ inputmodules="dvdnav $inputmodules"
+ def_dvdnav='#define HAVE_DVDNAV 0'
+ noinputmodules="dvdnav $noinputmodules"
+echores "$_dvdnav"
echocheck "libcdio"
if test "$_libcdio" = auto ; then
@@ -3249,6 +3268,7 @@ DSOUND = $_dsound
WASAPI = $_wasapi
DVBIN = $_dvbin
DVDREAD = $_dvdread
+DVDNAV = $_dvdnav
GL = $_gl
GL_COCOA = $_gl_cocoa
GL_WIN32 = $_gl_win32
@@ -3396,6 +3416,7 @@ $def_arch_x86_64