Made VDR compile with libdvdread-0.9.1

3 files changed, 16 insertions, 5 deletions

diff --git a/HISTORY b/HISTORY
index 4b68aebc..507a46c4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -758,3 +758,9 @@ Video Disk Recorder Revision History
 - Three new keys ("Volume+", Volume-" and "Mute") to control the DVB card's
   audio output volume.
 - New version of the 'epg2timers' tool (thanks to Carsten Koch).
+
+2001-09-21: Version 0.96
+
+- Made VDR compile with libdvdread-0.9.1 (thanks to Andreas Schultz).
+  Note that you now _need_ version 0.9.1 of libdvdread to compile VDR with
+  DVD support!
diff --git a/INSTALL b/INSTALL
index e745d7e7..27477a87 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,7 +27,12 @@ You can find 'libdvdread' at
 
   http://www.dtek.chalmers.se/groups/dvd/downloads.html
 
-VDR requires the card driver version dated 2001-09-14 or higher
+If you want to replay CSS encrypted DVDs you also need to get the 'libdvdcss'
+library from
+
+  http://www.videolan.org/libdvdcss/download.html
+
+VDR requires the Linux-DVB card driver version dated 2001-09-14 or higher
 to work properly.
 
 After extracting the package, change into the VDR directory
@@ -177,7 +182,7 @@ You can use the '-V' option to overwrite this, as in
 
 Note that the user id under which VDR runs needs to have write access to
 the DVD device in order to replay CSS protected DVDs (which also requires
-the presence of the 'libcss' library).
+the presence of the 'libdvdcss' library).
 
 The video data directory:
 -------------------------
diff --git a/dvbapi.c b/dvbapi.c
index 16b3e308..1d905de0 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.125 2001/09/16 13:55:03 kls Exp $
+ * $Id: dvbapi.c 1.126 2001/09/21 14:14:28 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -1670,7 +1670,7 @@ void cDVDplayBuffer::Input(void)
                  /**
                   * Parse the contained dsi packet.
                   */
-                 navRead_DSI(&dsi_pack, &(data[DSI_START_BYTE]), sizeof(dsi_t));
+                 navRead_DSI(&dsi_pack, &(data[DSI_START_BYTE]));
                  if (cur_pack != dsi_pack.dsi_gi.nv_pck_lbn) {
                     esyslog(LOG_ERR, "ERROR: cur_pack != dsi_pack.dsi_gi.nv_pck_lbn");
                     return;
@@ -1748,7 +1748,7 @@ void cDVDplayBuffer::Input(void)
                  dsyslog(LOG_INFO, "DVD: read pack: %d", cur_pack);
 #endif
                  int len = DVDReadBlocks(title, cur_pack, cur_output_size, data);
-                 if (len != (int)cur_output_size * DVD_VIDEO_LB_LEN) {
+                 if (len != (int)cur_output_size) {
                     esyslog(LOG_ERR, "ERROR: read failed for %d blocks at %d", cur_output_size, cur_pack);
                     doplay = false;
                     break;