[libdvdnav-devel] dvd_input.c: can link with dvdcss without new open_stream symbol

[Thomas Guillem]

libdvdread | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Jan 28 14:45:52 2015 +0100| [6b86232c82503d65b3a5d25283ae5f9a7f66acc0] | committer: Jean-Baptiste Kempf

dvd_input.c: can link with dvdcss without new open_stream symbol

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/libdvdread.git/?a=commit;h=6b86232c82503d65b3a5d25283ae5f9a7f66acc0
---

 src/dvd_input.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/dvd_input.c b/src/dvd_input.c
index 0c6f92e..64e5c5b 100644
--- a/src/dvd_input.c
+++ b/src/dvd_input.c
@@ -98,8 +98,12 @@ static dvd_input_t css_open(const char *target,
   /* Really open it with libdvdcss */
   if(target)
       dev->dvdcss = DVDcss_open(target);
-  else if(stream && stream_cb)
+  else if(stream && stream_cb) {
+#ifndef HAVE_DVDCSS_DVDCSS_H
+    if (DVDcss_open_stream)
+#endif
       dev->dvdcss = DVDcss_open_stream(stream, (dvdcss_stream_cb *)stream_cb);
+  }
   if(dev->dvdcss == 0) {
     fprintf(stderr, "libdvdread: Could not open %s with libdvdcss.\n", target);
     free(dev);
@@ -331,7 +335,7 @@ int dvdinput_setup(void)
               "http://www.videolan.org/\n" );
       dlclose(dvdcss_library);
       dvdcss_library = NULL;
-    } else if(!DVDcss_open_stream ||!DVDcss_open || !DVDcss_close || !DVDcss_seek
+    } else if(!DVDcss_open || !DVDcss_close || !DVDcss_seek
               || !DVDcss_read || !DVDcss_error) {
       fprintf(stderr,  "libdvdread: Missing symbols in %s, "
               "this shouldn't happen !\n", CSS_LIB);