Skip to content

V
vlc
Commit fc253a4e authored by Tristan Matthews's avatar Tristan Matthews
Browse files
Options

access: dvdnav: add additional version checking 

Fixes #15357
parent 65a987ec
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 1 deletion
configure.ac
View file @ fc253a4e
...@@ -1698,6 +1698,15 @@ dnl ...@@ -1698,6 +1698,15 @@ dnl
dnl libdvdnav plugin dnl libdvdnav plugin
dnl dnl
PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 4.9.0], [DVD with navigation input module (dvdnav)], [auto]) 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
dnl Blu-ray Disc Support with libbluray dnl Blu-ray Disc Support with libbluray
......
modules/access/dvdnav.c
View file @ fc253a4e
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
static int AccessDemuxOpen ( vlc_object_t * ); static int AccessDemuxOpen ( vlc_object_t * );
static void Close( 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 #define HAVE_DVDNAV_DEMUX
static int DemuxOpen ( vlc_object_t * ); static int DemuxOpen ( vlc_object_t * );
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment