mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-19 19:42:24 +02:00
Code

wscript: decouple dvdnav check from dvdread

Browse Source 
Reallows enabling dvdnav without enabling dvdread which was broken
in 77cbb3543 when they were both disabled by default.
Since dvdnav requires dvdread, we can enable dvdread:// even if
--enable-dvdread isn't passed.

Fixes #4290
This commit is contained in:
Ricardo Constantino 2017-03-31 16:43:20 +01:00
parent 9b077a5cca
commit 34e6a26f4d
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stream/stream.c
View File

@ -93,7 +93,7 @@ static const stream_info_t *const stream_list[] = {
#if HAVE_LIBSMBCLIENT
&stream_info_smb,
#endif
#if HAVE_DVDREAD
#if HAVE_DVDREAD || HAVE_DVDNAV
&stream_info_ifo,
&stream_info_dvd,
#endif

4
wscript
View File

@ -338,8 +338,8 @@ iconv support use --disable-iconv.",
}, {
'name': '--dvdnav',
'desc': 'dvdnav support',
'deps': [ 'dvdread' ],
'func': check_pkg_config('dvdnav', '>= 4.2.0'),
'func': check_pkg_config('dvdnav', '>= 4.2.0',
'dvdread', '>= 4.1.0'),
'default': 'disable',
}, {
'name': '--cdda',

2
wscript_build.py
View File

@ -260,7 +260,9 @@ def build(ctx):
( "stream/stream_cdda.c", "cdda" ),
( "stream/stream_dvb.c", "dvbin" ),
( "stream/stream_dvd.c", "dvdread" ),
( "stream/stream_dvd.c", "dvdnav" ),
( "stream/stream_dvd_common.c", "dvdread" ),
( "stream/stream_dvd_common.c", "dvdnav" ),
( "stream/stream_dvdnav.c", "dvdnav" ),
( "stream/stream_edl.c" ),
( "stream/stream_file.c" ),