videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-07-17 05:01:41 +02:00
Code Releases Activity

access: dvdnav: add additional version checking

Browse Source 
Fixes #15357
This commit is contained in:
Tristan Matthews 2015-08-31 16:01:25 -04:00
parent 65a987ec84
commit fc253a4ed7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -1698,6 +1698,15 @@ dnl
dnl libdvdnav plugin
dnl
PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 4.9.0], [DVD with navigation input module (dvdnav)], [auto])
AS_IF([test "${enable_dvdnav}" != "no"], [
AC_MSG_CHECKING(for dvdnav_stream_cb in dvdnav/dvdnav.h)
AC_EGREP_HEADER(dvdnav_stream_cb,dvdnav/dvdnav.h,[
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_STREAM_CB_IN_DVDNAV_H, 1, For dvdnav demux support)
],[
AC_MSG_RESULT(no)
])
])
dnl
dnl Blu-ray Disc Support with libbluray

2
modules/access/dvdnav.c
View File

@ -80,7 +80,7 @@
static int AccessDemuxOpen ( vlc_object_t * );
static void Close( vlc_object_t * );
#if DVDREAD_VERSION >= 50300
#if DVDREAD_VERSION >= 50300 && defined( HAVE_STREAM_CB_IN_DVDNAV_H )
#define HAVE_DVDNAV_DEMUX
static int DemuxOpen ( vlc_object_t * );
#endif