update to libdvdread 0.9.4

CVS patchset: 4306
CVS date: 2003/02/28 15:54:36

1 files changed, 279 insertions, 489 deletions

diff --git a/src/input/libdvdread/diff_against_cvs.patch b/src/input/libdvdread/diff_against_cvs.patch
index f5470a554..349b4c1ee 100644
--- a/src/input/libdvdread/diff_against_cvs.patch
+++ b/src/input/libdvdread/diff_against_cvs.patch
@@ -1,6 +1,6 @@
---- src/input/libdvdread/dvd_input.c	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/dvd_input.c	2002-11-27 21:50:03.000000000 +0100
-@@ -63,7 +63,7 @@
+--- src/input/libdvdread/dvd_input.c	2003-02-13 22:48:24.000000000 +0100
++++ src/input/libdvdread/dvd_input.c	2003-02-28 14:12:36.000000000 +0100
+@@ -74,7 +74,7 @@
    dvd_input_t dev;
      
    /* Allocate the handle structure */
@@ -9,7 +9,7 @@
    if(dev == NULL) {
      fprintf(stderr, "libdvdread: Could not allocate memory.\n");
      return NULL;
-@@ -143,7 +143,7 @@
+@@ -154,7 +154,7 @@
    dvd_input_t dev;
    
    /* Allocate the library structure */
@@ -18,17 +18,9 @@
    if(dev == NULL) {
      fprintf(stderr, "libdvdread: Could not allocate memory.\n");
      return NULL;
---- src/input/libdvdread/dvd_reader.c	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/dvd_reader.c	2002-11-27 21:51:31.000000000 +0100
-@@ -28,7 +28,6 @@
- #include <unistd.h>
- #include <limits.h>
- #include <dirent.h>
-- 
- #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
- #define SYS_BSD 1
- #endif
-@@ -41,6 +40,7 @@
+--- src/input/libdvdread/dvd_reader.c	2003-02-13 23:31:21.000000000 +0100
++++ src/input/libdvdread/dvd_reader.c	2003-02-28 14:24:48.000000000 +0100
+@@ -44,6 +44,7 @@
  #include <mntent.h>
  #endif
  
@@ -36,7 +28,7 @@
  #include "dvd_udf.h"
  #include "dvd_input.h"
  #include "dvd_reader.h"
-@@ -289,7 +289,7 @@
+@@ -349,7 +350,7 @@
  	    
  	    if( cdir >= 0 ) {
  		chdir( path_copy );
@@ -45,7 +37,7 @@
  		fchdir( cdir );
  		close( cdir );
  		if( new_path ) {
-@@ -452,7 +452,7 @@
+@@ -513,7 +514,7 @@
  
  static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
  {
@@ -54,7 +46,7 @@
      const char *nodirfile;
      int ret;
  
-@@ -486,7 +486,7 @@
+@@ -547,7 +548,7 @@
   */
  static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
  {
@@ -63,7 +55,7 @@
      dvd_file_t *dvd_file;
      struct stat fileinfo;
      dvd_input_t dev;
-@@ -570,7 +570,7 @@
+@@ -631,7 +632,7 @@
  static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
  {
      char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -72,7 +64,7 @@
      struct stat fileinfo;
      dvd_file_t *dvd_file;
      int i;
-@@ -867,7 +867,7 @@
+@@ -930,7 +931,7 @@
  
  ssize_t DVDReadBytes( dvd_file_t *dvd_file, void *data, size_t byte_size )
  {
@@ -81,17 +73,19 @@
      unsigned int numsec, seek_sector, seek_byte;
      int ret;
      
-@@ -881,7 +881,8 @@
+@@ -944,8 +945,9 @@
      numsec = ( ( seek_byte + byte_size ) / DVD_VIDEO_LB_LEN ) +
        ( ( ( seek_byte + byte_size ) % DVD_VIDEO_LB_LEN ) ? 1 : 0 );
      
 -    secbuf = (unsigned char *) malloc( numsec * DVD_VIDEO_LB_LEN );
+-    if( !secbuf ) {
 +    secbuf_base = (unsigned char *) malloc( numsec * DVD_VIDEO_LB_LEN + 2048 );
 +    secbuf = (unsigned char *)(((int)secbuf_base & ~2047) + 2048);
-     if( !secbuf ) {
++    if( !secbuf_base ) {
  	fprintf( stderr, "libdvdread: Can't allocate memory " 
  		 "for file read!\n" );
-@@ -897,12 +898,12 @@
+         return 0;
+@@ -960,12 +962,12 @@
      }
  
      if( ret != (int) numsec ) {
@@ -106,9 +100,85 @@
  
      dvd_file->seek_pos += byte_size;
      return byte_size;
---- src/input/libdvdread/dvd_udf.c	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/dvd_udf.c	2002-11-27 21:50:03.000000000 +0100
-@@ -123,7 +123,7 @@
+@@ -997,9 +999,10 @@
+ 	if( dvd_file != NULL ) {
+ 	    ssize_t bytes_read;
+ 	    size_t file_size = dvd_file->filesize * DVD_VIDEO_LB_LEN;
+-	    char *buffer = malloc( file_size );
++	    char *buffer_base = malloc( file_size + 2048 );
++	    char *buffer = (unsigned char *)(((int)buffer_base & ~2047) + 2048);
+ 	    
+-	    if( buffer == NULL ) {
++	    if( buffer_base == NULL ) {
+ 		fprintf( stderr, "libdvdread: DVDDiscId, failed to "
+ 			 "allocate memory for file read!\n" );
+ 		return -1;
+@@ -1009,13 +1012,14 @@
+ 		fprintf( stderr, "libdvdread: DVDDiscId read returned %d bytes"
+ 			 ", wanted %d\n", bytes_read, file_size );
+ 		DVDCloseFile( dvd_file );
++		free( buffer_base );
+ 		return -1;
+ 	    }
+ 	    
+ 	    md5_process_bytes( buffer, file_size,  &ctx );
+ 	    
+ 	    DVDCloseFile( dvd_file );
+-	    free( buffer );
++	    free( buffer_base );
+ 	}
+     }
+     md5_finish_ctx( &ctx, discid );
+@@ -1028,7 +1032,7 @@
+ 		      char *volid, unsigned int volid_size,
+ 		      unsigned char *volsetid, unsigned int volsetid_size )
+ {
+-  unsigned char *buffer;
++  unsigned char *buffer, *buffer_base;
+   int ret;
+ 
+   /* Check arguments. */
+@@ -1040,8 +1044,10 @@
+     return -1;
+   }
+   
+-  buffer = malloc( DVD_VIDEO_LB_LEN );
+-  if( buffer == NULL ) {
++  buffer_base = malloc( DVD_VIDEO_LB_LEN + 2048 );
++  buffer = (unsigned char *)(((int)buffer_base & ~2047) + 2048);
++
++  if( buffer_base == NULL ) {
+     fprintf( stderr, "libdvdread: DVDISOVolumeInfo, failed to "
+ 	     "allocate memory for file read!\n" );
+     return -1;
+@@ -1051,6 +1057,7 @@
+   if( ret != 1 ) {
+     fprintf( stderr, "libdvdread: DVDISOVolumeInfo, failed to "
+ 	     "read ISO9660 Primary Volume Descriptor!\n" );
++    free( buffer_base );
+     return -1;
+   }
+   
+@@ -1076,6 +1083,7 @@
+     }
+     memcpy(volsetid, &buffer[190], volsetid_size);
+   }
++  free( buffer_base );
+   return 0;
+ }
+ 
+--- src/input/libdvdread/dvd_udf.c	2003-02-13 22:57:17.000000000 +0100
++++ src/input/libdvdread/dvd_udf.c	2003-02-28 14:53:36.000000000 +0100
+@@ -237,7 +237,7 @@
+   
+   if(c == NULL) {
+     c = calloc(1, sizeof(struct udf_cache));    
+-    //    fprintf(stderr, "calloc: %d\n", sizeof(struct udf_cache));    
++    /* fprintf(stderr, "calloc: %d\n", sizeof(struct udf_cache)); */
+     if(c == NULL) {
+       return 0;
+     }
+@@ -346,7 +346,7 @@
  static int UDFDescriptor( uint8_t *data, uint16_t *TagID ) 
  {
      *TagID = GETN2(0);
@@ -117,7 +187,7 @@
      return 0;
  }
  
-@@ -141,7 +141,7 @@
+@@ -364,7 +364,7 @@
      ad->Flags = ad->Length >> 30;
      ad->Length &= 0x3FFFFFFF;
      ad->Location = GETN4(4);
@@ -126,7 +196,7 @@
      return 0;
  }
  
-@@ -152,7 +152,7 @@
+@@ -375,7 +375,7 @@
      ad->Length &= 0x3FFFFFFF;
      ad->Location = GETN4(4);
      ad->Partition = GETN2(8);
@@ -135,7 +205,7 @@
      return 0;
  }
  
-@@ -163,7 +163,7 @@
+@@ -386,7 +386,7 @@
      ad->Length &= 0x3FFFFFFF;
      ad->Location = GETN4(12);
      ad->Partition = GETN2(16);
@@ -144,7 +214,7 @@
      return 0;
  }
  
-@@ -194,9 +194,9 @@
+@@ -417,9 +417,9 @@
  {
      uint32_t lbsize, MT_L, N_PM;
      Unicodedecode(&data[84], 128, VolumeDescriptor);
@@ -157,7 +227,7 @@
      if (lbsize != DVD_VIDEO_LB_LEN) return 1;
      return 0;
  }
-@@ -211,10 +211,10 @@
+@@ -434,10 +434,10 @@
      UDFICB( &data[ 16 ], FileType, &flags );
     
      /* Init ad for an empty file (i.e. there isn't a AD, L_AD == 0 ) */
@@ -171,7 +241,7 @@
  
      L_EA = GETN4( 168 );
      L_AD = GETN4( 172 );
-@@ -264,7 +264,8 @@
+@@ -487,7 +487,8 @@
  static int UDFMapICB( dvd_reader_t *device, struct AD ICB, uint8_t *FileType,
  		      struct Partition *partition, struct AD *File ) 
  {
@@ -180,9 +250,9 @@
 +    uint8_t *LogBlock = (uint8_t *)(((int)LogBlock_base & ~2047) + 2048);
      uint32_t lbnum;
      uint16_t TagID;
- 
-@@ -296,7 +297,8 @@
-                        struct Partition *partition, struct AD *FileICB ) 
+     struct icbmap tmpmap;
+@@ -531,12 +532,13 @@
+ 		       int cache_file_info) 
  {
      char filename[ MAX_UDF_FILE_NAME_LEN ];
 -    uint8_t directory[ 2 * DVD_VIDEO_LB_LEN ];
@@ -191,19 +261,48 @@
      uint32_t lbnum;
      uint16_t TagID;
      uint8_t filechar;
-@@ -342,7 +344,10 @@
+     unsigned int p;
+-    uint8_t *cached_dir = NULL;
++    uint8_t *cached_dir_base = NULL, *cached_dir;
+     uint32_t dir_lba;
+     struct AD tmpICB;
+     int found = 0;
+@@ -550,11 +552,12 @@
+       
+       if(!GetUDFCache(device, LBUDFCache, lbnum, &cached_dir)) {
+ 	dir_lba = (Dir.Length + DVD_VIDEO_LB_LEN) / DVD_VIDEO_LB_LEN;
+-	if((cached_dir = malloc(dir_lba * DVD_VIDEO_LB_LEN)) == NULL) {
++	if((cached_dir_base = malloc(dir_lba * DVD_VIDEO_LB_LEN + 2048)) == NULL) {
+ 	  return 0;
+ 	}
++	cached_dir = (uint8_t *)(((int)cached_dir_base & ~2047) + 2048);
+ 	if( DVDReadLBUDF( device, lbnum, dir_lba, cached_dir, 0) <= 0 ) {
+-	  free(cached_dir);
++	  free(cached_dir_base);
+ 	  cached_dir = NULL;
+ 	}
+ 	/*
+@@ -642,7 +645,8 @@
+ static int UDFGetAVDP( dvd_reader_t *device,
+ 		       struct avdp_t *avdp)
+ {
+-  uint8_t Anchor[ DVD_VIDEO_LB_LEN ];
++  uint8_t Anchor_base[ DVD_VIDEO_LB_LEN + 2048 ];
++  uint8_t *Anchor = (uint8_t *)(((int)Anchor_base & ~2047) + 2048);
+   uint32_t lbnum, MVDS_location, MVDS_length;
+   uint16_t TagID;
+   uint32_t lastsector;
+@@ -713,7 +717,8 @@
  static int UDFFindPartition( dvd_reader_t *device, int partnum,
  			     struct Partition *part ) 
  {
--    uint8_t LogBlock[ DVD_VIDEO_LB_LEN ], Anchor[ DVD_VIDEO_LB_LEN ];
+-    uint8_t LogBlock[ DVD_VIDEO_LB_LEN ];
 +    uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ];
 +    uint8_t *LogBlock = (uint8_t *)(((int)LogBlock_base & ~2047) + 2048);
-+    uint8_t Anchor_base[ DVD_VIDEO_LB_LEN + 2048 ];
-+    uint8_t *Anchor = (uint8_t *)(((int)Anchor_base & ~2047) + 2048);
      uint32_t lbnum, MVDS_location, MVDS_length;
      uint16_t TagID;
-     uint32_t lastsector;
-@@ -434,7 +439,8 @@
+     int i, volvalid;
+@@ -775,7 +780,8 @@
  uint32_t UDFFindFile( dvd_reader_t *device, char *filename,
  		      uint32_t *filesize )
  {
@@ -213,7 +312,7 @@
      uint32_t lbnum;
      uint16_t TagID;
      struct Partition partition;
-@@ -460,7 +466,7 @@
+@@ -805,7 +811,7 @@
          }
  
          /* File Set Descriptor */
@@ -222,18 +321,19 @@
              UDFLongAD( &LogBlock[ 400 ], &RootICB );
          }
      } while( ( lbnum < partition.Start + partition.Length )
---- src/input/libdvdread/ifo_print.c	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/ifo_print.c	2002-11-27 21:50:03.000000000 +0100
-@@ -25,7 +25,7 @@
- #include <ctype.h>
- #include <assert.h>
- 
--#include "config.h" // Needed for WORDS_BIGENDIAN
-+#include "config.h" /* Needed for WORDS_BIGENDIAN */
- #include "ifo_types.h"
- #include "ifo_read.h"
- #include "ifo_print.h"
-@@ -71,7 +71,7 @@
+@@ -919,7 +925,8 @@
+ 
+ static int UDFGetPVD(dvd_reader_t *device, struct pvd_t *pvd)
+ {
+-  uint8_t pvd_buf[DVD_VIDEO_LB_LEN];
++  uint8_t pvd_buf_base[DVD_VIDEO_LB_LEN + 2048];
++  uint8_t *pvd_buf = (uint8_t *)(((int)pvd_buf_base & ~2047) + 2048);
+   
+   if(GetUDFCache(device, PVDCache, 0, pvd)) {
+     return 1;
+--- src/input/libdvdread/ifo_print.c	2003-02-02 03:23:53.000000000 +0100
++++ src/input/libdvdread/ifo_print.c	2003-02-28 14:40:32.000000000 +0100
+@@ -73,7 +73,7 @@
      printf("%02x ", command->bytes[i]);
    printf("| ");
  
@@ -242,7 +342,7 @@
    printf("\n");
  }
  
-@@ -126,19 +126,19 @@
+@@ -129,19 +129,19 @@
      printf("(please send a bug report) ");
    }
    
@@ -265,7 +365,7 @@
      break;
    default:
      printf("(please send a bug report)");
-@@ -184,7 +184,7 @@
+@@ -198,7 +198,7 @@
    if(attr->film_mode) {
      printf("film");
    } else {
@@ -274,16 +374,16 @@
    }
  }
  
-@@ -235,7 +235,7 @@
+@@ -251,7 +251,7 @@
    
    switch(attr->lang_type) {
    case 0:
 -    // not specified
 +    /* not specified */
-     assert(attr->lang_code == 0 || attr->lang_code == 0xffff);
+     CHECK_VALUE(attr->lang_code == 0 || attr->lang_code == 0xffff);
      break;
    case 1:
-@@ -247,7 +247,7 @@
+@@ -264,7 +264,7 @@
  
    switch(attr->application_mode) {
    case 0:
@@ -292,7 +392,7 @@
      break;
    case 1:
      printf("karaoke mode ");
-@@ -294,19 +294,19 @@
+@@ -311,19 +311,19 @@
    case 0:
      printf("Not specified ");
      break;
@@ -317,16 +417,7 @@
    default:
      printf("(please send a bug report) ");
    }
-@@ -796,7 +796,7 @@
-   
-   printf("Number of Countries: %i\n", ptl_mait->nr_of_countries);
-   printf("Number of VTSs: %i\n", ptl_mait->nr_of_vtss);
--  //printf("Last byte: %i\n", ptl_mait->last_byte);
-+  /* printf("Last byte: %i\n", ptl_mait->last_byte); */
-   
-   for(i = 0; i < ptl_mait->nr_of_countries; i++) {
-     printf("Country code: %c%c\n", 
-@@ -846,7 +846,7 @@
+@@ -913,7 +913,7 @@
    int i, entries;
    
    printf("Number of VOBs in this VOBS: %i\n", c_adt->nr_of_vobs);
@@ -335,7 +426,7 @@
    entries = (c_adt->last_byte + 1 - C_ADT_SIZE)/sizeof(c_adt_t);
    
    for(i = 0; i < entries; i++) {
-@@ -996,7 +996,7 @@
+@@ -1066,7 +1066,7 @@
      printf("\nText Data Manager Information\n");
      printf(  "-----------------------------\n");
      if(ifohandle->txtdt_mgi) {
@@ -344,8 +435,8 @@
      } else {
        printf("No Text Data Manager Information present\n");
      }
---- src/input/libdvdread/ifo_print.h	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/ifo_print.h	2002-11-27 21:50:03.000000000 +0100
+--- src/input/libdvdread/ifo_print.h	2002-08-15 22:13:21.000000000 +0200
++++ src/input/libdvdread/ifo_print.h	2003-02-28 14:12:36.000000000 +0100
 @@ -20,8 +20,8 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -357,52 +448,43 @@
  
  #ifdef __cplusplus
  extern "C" {
---- src/input/libdvdread/ifo_read.c	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/ifo_read.c	2002-11-27 21:50:03.000000000 +0100
-@@ -26,7 +26,7 @@
- 
- #include "dvd_reader.h"
- 
--#include "config.h" // Needed for WORDS_BIGENDIAN
-+#include "config.h" /* Needed for WORDS_BIGENDIAN */
- #include "bswap.h"
- #include "ifo_types.h"
- #include "ifo_read.h"
-@@ -643,7 +643,7 @@
+--- src/input/libdvdread/ifo_read.c	2003-01-17 21:49:16.000000000 +0100
++++ src/input/libdvdread/ifo_read.c	2003-02-28 14:43:40.000000000 +0100
+@@ -659,7 +659,7 @@
    /* Check that time is 0:0:0:0 also if nr_of_programs == 0 */
    if(pgc->nr_of_programs == 0) {
      CHECK_ZERO(pgc->still_time);
 -    CHECK_ZERO(pgc->pg_playback_mode); // ??
 +    CHECK_ZERO(pgc->pg_playback_mode); /* ?? */
-     assert(pgc->program_map_offset == 0);
-     assert(pgc->cell_playback_offset == 0);
-     assert(pgc->cell_position_offset == 0);
-@@ -829,24 +829,24 @@
+     CHECK_VALUE(pgc->program_map_offset == 0);
+     CHECK_VALUE(pgc->cell_playback_offset == 0);
+     CHECK_VALUE(pgc->cell_position_offset == 0);
+@@ -844,24 +844,24 @@
  
    CHECK_ZERO(tt_srpt->zero_1);
-   assert(tt_srpt->nr_of_srpts != 0);
--  assert(tt_srpt->nr_of_srpts < 100); // ??
-+  assert(tt_srpt->nr_of_srpts < 100); /* ?? */
-   assert((int)tt_srpt->nr_of_srpts * sizeof(title_info_t) <= info_length);
+   CHECK_VALUE(tt_srpt->nr_of_srpts != 0);
+-  CHECK_VALUE(tt_srpt->nr_of_srpts < 100); // ??
++  CHECK_VALUE(tt_srpt->nr_of_srpts < 100); /* ?? */
+   CHECK_VALUE((int)tt_srpt->nr_of_srpts * sizeof(title_info_t) <= info_length);
    
    for(i = 0; i < tt_srpt->nr_of_srpts; i++) {
-     assert(tt_srpt->title[i].pb_ty.zero_1 == 0);
-     assert(tt_srpt->title[i].nr_of_angles != 0);
-     assert(tt_srpt->title[i].nr_of_angles < 10);
--    //assert(tt_srpt->title[i].nr_of_ptts != 0);
+     CHECK_VALUE(tt_srpt->title[i].pb_ty.zero_1 == 0);
+     CHECK_VALUE(tt_srpt->title[i].nr_of_angles != 0);
+     CHECK_VALUE(tt_srpt->title[i].nr_of_angles < 10);
+-    //CHECK_VALUE(tt_srpt->title[i].nr_of_ptts != 0);
 -    // XXX: this assertion breaks Ghostbusters:
--    assert(tt_srpt->title[i].nr_of_ptts < 1000); // ??
-+    /* assert(tt_srpt->title[i].nr_of_ptts != 0); */
+-    CHECK_VALUE(tt_srpt->title[i].nr_of_ptts < 1000); // ??
++    /* CHECK_VALUE(tt_srpt->title[i].nr_of_ptts != 0); */
 +    /* XXX: this assertion breaks Ghostbusters: */
-+    assert(tt_srpt->title[i].nr_of_ptts < 1000); /* ?? */
-     assert(tt_srpt->title[i].title_set_nr != 0);
--    assert(tt_srpt->title[i].title_set_nr < 100); // ??
-+    assert(tt_srpt->title[i].title_set_nr < 100); /* ?? */
-     assert(tt_srpt->title[i].vts_ttn != 0);
--    assert(tt_srpt->title[i].vts_ttn < 100); // ??
--    //assert(tt_srpt->title[i].title_set_sector != 0);
-+    assert(tt_srpt->title[i].vts_ttn < 100); /* ?? */
-+    /* assert(tt_srpt->title[i].title_set_sector != 0); */
++    CHECK_VALUE(tt_srpt->title[i].nr_of_ptts < 1000); /* ?? */
+     CHECK_VALUE(tt_srpt->title[i].title_set_nr != 0);
+-    CHECK_VALUE(tt_srpt->title[i].title_set_nr < 100); // ??
++    CHECK_VALUE(tt_srpt->title[i].title_set_nr < 100); /* ?? */
+     CHECK_VALUE(tt_srpt->title[i].vts_ttn != 0);
+-    CHECK_VALUE(tt_srpt->title[i].vts_ttn < 100); // ??
+-    //CHECK_VALUE(tt_srpt->title[i].title_set_sector != 0);
++    CHECK_VALUE(tt_srpt->title[i].vts_ttn < 100); /* ?? */
++    /* CHECK_VALUE(tt_srpt->title[i].title_set_sector != 0); */
    }
    
 -  // Make this a function
@@ -410,74 +492,71 @@
  #if 0
    if(memcmp((uint8_t *)tt_srpt->title + 
              tt_srpt->nr_of_srpts * sizeof(title_info_t), 
-@@ -910,7 +910,7 @@
+@@ -925,7 +925,7 @@
  
    CHECK_ZERO(vts_ptt_srpt->zero_1);
-   assert(vts_ptt_srpt->nr_of_srpts != 0);
--  assert(vts_ptt_srpt->nr_of_srpts < 100); // ??
-+  assert(vts_ptt_srpt->nr_of_srpts < 100); /* ?? */
+   CHECK_VALUE(vts_ptt_srpt->nr_of_srpts != 0);
+-  CHECK_VALUE(vts_ptt_srpt->nr_of_srpts < 100); // ??
++  CHECK_VALUE(vts_ptt_srpt->nr_of_srpts < 100); /* ?? */
    
    info_length = vts_ptt_srpt->last_byte + 1 - VTS_PTT_SRPT_SIZE;
    
-@@ -985,12 +985,12 @@
+@@ -1001,12 +1001,12 @@
    }
    
    for(i = 0; i < vts_ptt_srpt->nr_of_srpts; i++) {
--    assert(vts_ptt_srpt->title[i].nr_of_ptts < 1000); // ??
-+    assert(vts_ptt_srpt->title[i].nr_of_ptts < 1000); /* ?? */
+-    CHECK_VALUE(vts_ptt_srpt->title[i].nr_of_ptts < 1000); // ??
++    CHECK_VALUE(vts_ptt_srpt->title[i].nr_of_ptts < 1000); /* ?? */
      for(j = 0; j < vts_ptt_srpt->title[i].nr_of_ptts; j++) {
-       assert(vts_ptt_srpt->title[i].ptt[j].pgcn != 0 );
--      assert(vts_ptt_srpt->title[i].ptt[j].pgcn < 1000); // ??
-+      assert(vts_ptt_srpt->title[i].ptt[j].pgcn < 1000); /* ?? */
-       assert(vts_ptt_srpt->title[i].ptt[j].pgn != 0);
--      assert(vts_ptt_srpt->title[i].ptt[j].pgn < 100); // ??
-+      assert(vts_ptt_srpt->title[i].ptt[j].pgn < 100); /* ?? */
+       CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgcn != 0 );
+-      CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgcn < 1000); // ??
++      CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgcn < 1000); /* ?? */
+       CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgn != 0);
+-      CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgn < 100); // ??
++      CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgn < 100); /* ?? */
      }
    }
  
-@@ -1049,9 +1049,9 @@
-   info_length = ptl_mait->last_byte + 1 - PTL_MAIT_SIZE;
+@@ -1064,9 +1064,9 @@
+   B2N_32(ptl_mait->last_byte);
    
-   assert(ptl_mait->nr_of_countries != 0);
--  assert(ptl_mait->nr_of_countries < 100); // ??
-+  assert(ptl_mait->nr_of_countries < 100); /* ?? */
-   assert(ptl_mait->nr_of_vtss != 0);
--  assert(ptl_mait->nr_of_vtss < 100); // ??  
-+  assert(ptl_mait->nr_of_vtss < 100); /* ?? */
-   assert(ptl_mait->nr_of_countries * PTL_MAIT_COUNTRY_SIZE <= info_length);
+   CHECK_VALUE(ptl_mait->nr_of_countries != 0);
+-  CHECK_VALUE(ptl_mait->nr_of_countries < 100); // ??
++  CHECK_VALUE(ptl_mait->nr_of_countries < 100); /* ?? */
+   CHECK_VALUE(ptl_mait->nr_of_vtss != 0);
+-  CHECK_VALUE(ptl_mait->nr_of_vtss < 100); // ??  
++  CHECK_VALUE(ptl_mait->nr_of_vtss < 100); /* ?? */
+   CHECK_VALUE(ptl_mait->nr_of_countries * PTL_MAIT_COUNTRY_SIZE 
+ 	      <= ptl_mait->last_byte + 1 - PTL_MAIT_SIZE);
    
-   /* Change this to read and 'translate' the tables too. 
-@@ -1519,7 +1519,7 @@
+@@ -1605,7 +1605,7 @@
    /* assert(pgcit->nr_of_pgci_srp != 0);
       Magic Knight Rayearth Daybreak is mastered very strange and has 
       Titles with 0 PTTs. */
--  assert(pgcit->nr_of_pgci_srp < 10000); // ?? seen max of 1338
-+  assert(pgcit->nr_of_pgci_srp < 10000); /* ?? seen max of 1338 */
+-  CHECK_VALUE(pgcit->nr_of_pgci_srp < 10000); // ?? seen max of 1338
++  CHECK_VALUE(pgcit->nr_of_pgci_srp < 10000); /* ?? seen max of 1338 */
    
    info_length = pgcit->nr_of_pgci_srp * PGCI_SRP_SIZE;
    data = malloc(info_length);
-@@ -1640,7 +1640,7 @@
+@@ -1726,7 +1726,7 @@
    
    CHECK_ZERO(pgci_ut->zero_1);
-   assert(pgci_ut->nr_of_lus != 0);
--  assert(pgci_ut->nr_of_lus < 100); // ?? 3-4 ?
-+  assert(pgci_ut->nr_of_lus < 100); /* ?? 3-4 ? */
-   assert((uint32_t)pgci_ut->nr_of_lus * PGCI_LU_SIZE < pgci_ut->last_byte);
+   CHECK_VALUE(pgci_ut->nr_of_lus != 0);
+-  CHECK_VALUE(pgci_ut->nr_of_lus < 100); // ?? 3-4 ?
++  CHECK_VALUE(pgci_ut->nr_of_lus < 100); /* ?? 3-4 ? */
+   CHECK_VALUE((uint32_t)pgci_ut->nr_of_lus * PGCI_LU_SIZE < pgci_ut->last_byte);
  
    info_length = pgci_ut->nr_of_lus * PGCI_LU_SIZE;
-@@ -1675,8 +1675,9 @@
+@@ -1760,7 +1760,7 @@
+   free(data);
    
    for(i = 0; i < pgci_ut->nr_of_lus; i++) {
-     CHECK_ZERO(pgci_ut->lu[i].zero_1);
 -    // Maybe this is only defined for v1.1 and later titles?
--    /* If the bits in 'lu[i].exists' are enumerated abcd efgh then:
-+    /*
-+		   Maybe this is only defined for v1.1 and later titles? 
-+       If the bits in 'lu[i].exists' are enumerated abcd efgh then:
++    /* Maybe this is only defined for v1.1 and later titles? */
+     /* If the bits in 'lu[i].exists' are enumerated abcd efgh then:
              VTS_x_yy.IFO        VIDEO_TS.IFO
         a == 0x83 "Root"         0x82 "Title"
-        b == 0x84 "Subpicture"
-@@ -1714,8 +1715,10 @@
+@@ -1799,8 +1799,10 @@
        ifofile->pgci_ut = 0;
        return 0;
      }
@@ -490,9 +569,9 @@
    }
  
    return 1;
-@@ -1776,8 +1779,8 @@
+@@ -1861,8 +1863,8 @@
      unsigned int nr_coded;
-     assert(vts_attributes->last_byte + 1 >= VTS_ATTRIBUTES_MIN_SIZE);  
+     CHECK_VALUE(vts_attributes->last_byte + 1 >= VTS_ATTRIBUTES_MIN_SIZE);  
      nr_coded = (vts_attributes->last_byte + 1 - VTS_ATTRIBUTES_MIN_SIZE)/6;
 -    // This is often nr_coded = 70, how do you know how many there really are?
 -    if(nr_coded > 32) { // We haven't read more from disk/file anyway
@@ -500,29 +579,29 @@
 +    if(nr_coded > 32) { /* We haven't read more from disk/file anyway */
        nr_coded = 32;
      }
-     assert(vts_attributes->nr_of_vtstt_subp_streams <= nr_coded);
-@@ -1825,7 +1828,7 @@
+     CHECK_VALUE(vts_attributes->nr_of_vtstt_subp_streams <= nr_coded);
+@@ -1910,7 +1912,7 @@
  
    CHECK_ZERO(vts_atrt->zero_1);
-   assert(vts_atrt->nr_of_vtss != 0);
--  assert(vts_atrt->nr_of_vtss < 100); //??
-+  assert(vts_atrt->nr_of_vtss < 100); /* ?? */
-   assert((uint32_t)vts_atrt->nr_of_vtss * (4 + VTS_ATTRIBUTES_MIN_SIZE) + 
+   CHECK_VALUE(vts_atrt->nr_of_vtss != 0);
+-  CHECK_VALUE(vts_atrt->nr_of_vtss < 100); //??
++  CHECK_VALUE(vts_atrt->nr_of_vtss < 100); /* ?? */
+   CHECK_VALUE((uint32_t)vts_atrt->nr_of_vtss * (4 + VTS_ATTRIBUTES_MIN_SIZE) + 
           VTS_ATRT_SIZE < vts_atrt->last_byte + 1);
  
-@@ -1866,9 +1869,9 @@
+@@ -1954,9 +1956,9 @@
        return 0;
      }
  
 -    // This assert cant be in ifoRead_VTS_ATTRIBUTES
 +    /* This assert cant be in ifoRead_VTS_ATTRIBUTES */
-     assert(offset + vts_atrt->vts[i].last_byte <= vts_atrt->last_byte + 1);
+     CHECK_VALUE(offset + vts_atrt->vts[i].last_byte <= vts_atrt->last_byte + 1);
 -    // Is this check correct?
 +    /* Is this check correct? */
    }
-   free(data);
  
-@@ -1918,7 +1921,7 @@
+   return 1;
+@@ -2006,7 +2008,7 @@
      return 0;
    }
  
@@ -531,8 +610,8 @@
    return 1;
  }
  
---- src/input/libdvdread/ifo_read.h	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/ifo_read.h	2002-11-27 21:50:03.000000000 +0100
+--- src/input/libdvdread/ifo_read.h	2002-12-15 01:09:12.000000000 +0100
++++ src/input/libdvdread/ifo_read.h	2003-02-28 14:12:36.000000000 +0100
 @@ -20,8 +20,8 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -544,9 +623,8 @@
  
  #ifdef __cplusplus
  extern "C" {
-diff -urN libdvdread.cvs/ifo_types.h libdvdread.new/ifo_types.h
---- src/input/libdvdread/ifo_types.h	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/ifo_types.h	2002-11-27 21:50:03.000000000 +0100
+--- src/input/libdvdread/ifo_types.h	2003-02-22 22:42:11.000000000 +0100
++++ src/input/libdvdread/ifo_types.h	2003-02-28 14:12:36.000000000 +0100
 @@ -21,7 +21,7 @@
   */
  
@@ -556,263 +634,19 @@ diff -urN libdvdread.cvs/ifo_types.h libdvdread.new/ifo_types.h
  
  
  #undef ATTRIBUTE_PACKED
-@@ -59,7 +59,7 @@
-   uint8_t hour;
-   uint8_t minute;
-   uint8_t second;
--  uint8_t frame_u; // The two high bits are the frame rate.
-+  uint8_t frame_u; /* The two high bits are the frame rate. */
- } ATTRIBUTE_PACKED dvd_time_t;
- 
- /**
-@@ -130,7 +130,7 @@
-   unsigned int quantization           : 2;
- #endif
-   uint16_t lang_code;
--  uint8_t  lang_code2; // ??
-+  uint8_t  lang_code2; /* ?? */
-   uint8_t  lang_extension;
-   uint16_t unknown2;
- } ATTRIBUTE_PACKED audio_attr_t;
-@@ -235,65 +235,65 @@
-  */
- typedef struct {
- #ifdef WORDS_BIGENDIAN
--  unsigned int zero                           : 7; // 25-31
--  unsigned int video_pres_mode_change         : 1; // 24
--  
--  unsigned int karaoke_audio_pres_mode_change : 1; // 23
--  unsigned int angle_change                   : 1; // 22
--  unsigned int subpic_stream_change           : 1; // 21
--  unsigned int audio_stream_change            : 1; // 20
--  unsigned int pause_on                       : 1; // 19
--  unsigned int still_off                      : 1; // 18
--  unsigned int button_select_or_activate      : 1; // 17
--  unsigned int resume                         : 1; // 16
--  
--  unsigned int chapter_menu_call              : 1; // 15
--  unsigned int angle_menu_call                : 1; // 14
--  unsigned int audio_menu_call                : 1; // 13
--  unsigned int subpic_menu_call               : 1; // 12
--  unsigned int root_menu_call                 : 1; // 11
--  unsigned int title_menu_call                : 1; // 10
--  unsigned int backward_scan                  : 1; // 9
--  unsigned int forward_scan                   : 1; // 8
--  
--  unsigned int next_pg_search                 : 1; // 7
--  unsigned int prev_or_top_pg_search          : 1; // 6
--  unsigned int time_or_chapter_search         : 1; // 5
--  unsigned int go_up                          : 1; // 4
--  unsigned int stop                           : 1; // 3
--  unsigned int title_play                     : 1; // 2
--  unsigned int chapter_search_or_play         : 1; // 1
--  unsigned int title_or_time_play             : 1; // 0
-+  unsigned int zero                           : 7; /* 25-31 */
-+  unsigned int video_pres_mode_change         : 1; /* 24 */
-+
-+  unsigned int karaoke_audio_pres_mode_change : 1; /* 23 */
-+  unsigned int angle_change                   : 1; /* 22 */
-+  unsigned int subpic_stream_change           : 1; /* 21 */
-+  unsigned int audio_stream_change            : 1; /* 20 */
-+  unsigned int pause_on                       : 1; /* 19 */
-+  unsigned int still_off                      : 1; /* 18 */
-+  unsigned int button_select_or_activate      : 1; /* 17 */
-+  unsigned int resume                         : 1; /* 16 */
-+
-+  unsigned int chapter_menu_call              : 1; /* 15 */
-+  unsigned int angle_menu_call                : 1; /* 14 */
-+  unsigned int audio_menu_call                : 1; /* 13 */
-+  unsigned int subpic_menu_call               : 1; /* 12 */
-+  unsigned int root_menu_call                 : 1; /* 11 */
-+  unsigned int title_menu_call                : 1; /* 10 */
-+  unsigned int backward_scan                  : 1; /* 9 */
-+  unsigned int forward_scan                   : 1; /* 8 */
-+
-+  unsigned int next_pg_search                 : 1; /* 7 */
-+  unsigned int prev_or_top_pg_search          : 1; /* 6 */
-+  unsigned int time_or_chapter_search         : 1; /* 5 */
-+  unsigned int go_up                          : 1; /* 4 */
-+  unsigned int stop                           : 1; /* 3 */
-+  unsigned int title_play                     : 1; /* 2 */
-+  unsigned int chapter_search_or_play         : 1; /* 1 */
-+  unsigned int title_or_time_play             : 1; /* 0 */
- #else
--  unsigned int video_pres_mode_change         : 1; // 24
--  unsigned int zero                           : 7; // 25-31
--  
--  unsigned int resume                         : 1; // 16
--  unsigned int button_select_or_activate      : 1; // 17
--  unsigned int still_off                      : 1; // 18
--  unsigned int pause_on                       : 1; // 19
--  unsigned int audio_stream_change            : 1; // 20
--  unsigned int subpic_stream_change           : 1; // 21
--  unsigned int angle_change                   : 1; // 22
--  unsigned int karaoke_audio_pres_mode_change : 1; // 23
--  
--  unsigned int forward_scan                   : 1; // 8
--  unsigned int backward_scan                  : 1; // 9
--  unsigned int title_menu_call                : 1; // 10
--  unsigned int root_menu_call                 : 1; // 11
--  unsigned int subpic_menu_call               : 1; // 12
--  unsigned int audio_menu_call                : 1; // 13
--  unsigned int angle_menu_call                : 1; // 14
--  unsigned int chapter_menu_call              : 1; // 15
--  
--  unsigned int title_or_time_play             : 1; // 0
--  unsigned int chapter_search_or_play         : 1; // 1
--  unsigned int title_play                     : 1; // 2
--  unsigned int stop                           : 1; // 3
--  unsigned int go_up                          : 1; // 4
--  unsigned int time_or_chapter_search         : 1; // 5
--  unsigned int prev_or_top_pg_search          : 1; // 6
--  unsigned int next_pg_search                 : 1; // 7
-+  unsigned int video_pres_mode_change         : 1; /* 24 */
-+  unsigned int zero                           : 7; /* 25-31 */
-+
-+  unsigned int resume                         : 1; /* 16 */
-+  unsigned int button_select_or_activate      : 1; /* 17 */
-+  unsigned int still_off                      : 1; /* 18 */
-+  unsigned int pause_on                       : 1; /* 19 */
-+  unsigned int audio_stream_change            : 1; /* 20 */
-+  unsigned int subpic_stream_change           : 1; /* 21 */
-+  unsigned int angle_change                   : 1; /* 22 */
-+  unsigned int karaoke_audio_pres_mode_change : 1; /* 23 */
-+
-+  unsigned int forward_scan                   : 1; /* 8 */
-+  unsigned int backward_scan                  : 1; /* 9 */
-+  unsigned int title_menu_call                : 1; /* 10 */
-+  unsigned int root_menu_call                 : 1; /* 11 */
-+  unsigned int subpic_menu_call               : 1; /* 12 */
-+  unsigned int audio_menu_call                : 1; /* 13 */
-+  unsigned int angle_menu_call                : 1; /* 14 */
-+  unsigned int chapter_menu_call              : 1; /* 15 */
-+
-+  unsigned int title_or_time_play             : 1; /* 0 */
-+  unsigned int chapter_search_or_play         : 1; /* 1 */
-+  unsigned int title_play                     : 1; /* 2 */
-+  unsigned int stop                           : 1; /* 3 */
-+  unsigned int go_up                          : 1; /* 4 */
-+  unsigned int time_or_chapter_search         : 1; /* 5 */
-+  unsigned int prev_or_top_pg_search          : 1; /* 6 */
-+  unsigned int next_pg_search                 : 1; /* 7 */
- #endif
- } ATTRIBUTE_PACKED user_ops_t;
- 
-@@ -453,11 +453,11 @@
-   
-   video_attr_t vmgm_video_attr;
-   uint8_t  zero_7;
--  uint8_t  nr_of_vmgm_audio_streams; // should be 0 or 1
-+  uint8_t  nr_of_vmgm_audio_streams; /* should be 0 or 1 */
-   audio_attr_t vmgm_audio_attr;
-   audio_attr_t zero_8[7];
-   uint8_t  zero_9[17];
--  uint8_t  nr_of_vmgm_subp_streams; // should be 0 or 1
-+  uint8_t  nr_of_vmgm_subp_streams; /* should be 0 or 1 */
-   subp_attr_t  vmgm_subp_attr;
-   subp_attr_t  zero_10[27];  /* XXX: how much 'padding' here? */
- } ATTRIBUTE_PACKED vmgi_mat_t;
-@@ -465,21 +465,21 @@
- typedef struct {
- #ifdef WORDS_BIGENDIAN
-   unsigned int zero_1                    : 1;
--  unsigned int multi_or_random_pgc_title : 1; // 0 == one sequential pgc title
-+  unsigned int multi_or_random_pgc_title : 1; /* 0 == one sequential pgc title */
-   unsigned int jlc_exists_in_cell_cmd    : 1;
-   unsigned int jlc_exists_in_prepost_cmd : 1;
-   unsigned int jlc_exists_in_button_cmd  : 1;
-   unsigned int jlc_exists_in_tt_dom      : 1;
--  unsigned int chapter_search_or_play    : 1; // UOP 1
--  unsigned int title_or_time_play        : 1; // UOP 0
-+  unsigned int chapter_search_or_play    : 1; /* UOP 1 */
-+  unsigned int title_or_time_play        : 1; /* UOP 0 */
- #else
--  unsigned int title_or_time_play        : 1; // UOP 0
--  unsigned int chapter_search_or_play    : 1; // UOP 1
-+  unsigned int title_or_time_play        : 1; /* UOP 0 */
-+  unsigned int chapter_search_or_play    : 1; /* UOP 1 */
-   unsigned int jlc_exists_in_tt_dom      : 1;
-   unsigned int jlc_exists_in_button_cmd  : 1;
-   unsigned int jlc_exists_in_prepost_cmd : 1;
-   unsigned int jlc_exists_in_cell_cmd    : 1;
--  unsigned int multi_or_random_pgc_title : 1; // 0 == one sequential pgc title
-+  unsigned int multi_or_random_pgc_title : 1; /* 0 == one sequential pgc title */
-   unsigned int zero_1                    : 1;
- #endif
- } ATTRIBUTE_PACKED playback_type_t;
-@@ -540,12 +540,12 @@
-   
-   video_attr_t vtsm_vobs_attr;
-   uint8_t  zero_1;
--  uint8_t  nr_of_vtsm_audio_streams; // should be 0 or 1
-+  uint8_t  nr_of_vtsm_audio_streams; /* should be 0 or 1 */
-   audio_attr_t vtsm_audio_attr;
-   audio_attr_t zero_2[7];  
-   uint8_t  zero_3[16];
-   uint8_t  zero_4;
--  uint8_t  nr_of_vtsm_subp_streams; // should be 0 or 1
-+  uint8_t  nr_of_vtsm_subp_streams; /* should be 0 or 1 */
-   subp_attr_t vtsm_subp_attr;
-   subp_attr_t zero_5[27];
-   
-@@ -581,18 +581,18 @@
-   uint32_t last_byte;    /* offsets are relative here */
-   uint16_t offsets[100]; /* == nr_of_srpts + 1 (first is disc title) */
- #if 0  
--  uint16_t unknown; // 0x48 ?? 0x48 words (16bit) info following
-+  uint16_t unknown; /* 0x48 ?? 0x48 words (16bit) info following */
-   uint16_t zero_1;
-   
--  uint8_t type_of_info;//?? 01 == disc, 02 == Title, 04 == Title part 
-+  uint8_t type_of_info; /* ?? 01 == disc, 02 == Title, 04 == Title part */
-   uint8_t unknown1;
-   uint8_t unknown2;
-   uint8_t unknown3;
--  uint8_t unknown4;//?? allways 0x30 language?, text format?
-+  uint8_t unknown4;  /*?? allways 0x30 language?, text format? */
-   uint8_t unknown5;
--  uint16_t offset; // from first 
-+  uint16_t offset; /* from first */
-   
--  char text[12]; // ended by 0x09
-+  char text[12]; /* ended by 0x09 */
+--- src/input/libdvdread/md5.c	2003-01-12 01:46:16.000000000 +0100
++++ src/input/libdvdread/md5.c	2003-02-28 14:53:15.000000000 +0100
+@@ -36,7 +36,7 @@
  #endif
- } ATTRIBUTE_PACKED txtdt_t;
- 
-@@ -652,7 +652,7 @@
-   uint32_t vts_ptt_srpt;    /* sector */
-   uint32_t vts_pgcit;       /* sector */
-   uint32_t vtsm_pgci_ut;    /* sector */
--  uint32_t vts_tmapt;       /* sector */  // XXX: FIXME TODO Implement
-+  uint32_t vts_tmapt;       /* sector */  /* XXX: FIXME TODO Implement */
-   uint32_t vtsm_c_adt;      /* sector */
-   uint32_t vtsm_vobu_admap; /* sector */
-   uint32_t vts_c_adt;       /* sector */
-@@ -661,11 +661,11 @@
-   
-   video_attr_t vtsm_video_attr;
-   uint8_t  zero_14;
--  uint8_t  nr_of_vtsm_audio_streams; // should be 0 or 1
-+  uint8_t  nr_of_vtsm_audio_streams; /* should be 0 or 1 */
-   audio_attr_t vtsm_audio_attr;
-   audio_attr_t zero_15[7];
-   uint8_t  zero_16[17];
--  uint8_t  nr_of_vtsm_subp_streams; // should be 0 or 1
-+  uint8_t  nr_of_vtsm_subp_streams; /* should be 0 or 1 */
-   subp_attr_t vtsm_subp_attr;
-   subp_attr_t zero_17[27];
-   uint8_t  zero_18[2];
---- src/input/libdvdread/nav_print.c	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/nav_print.c	2002-11-27 21:50:03.000000000 +0100
-@@ -27,7 +27,7 @@
- #include <inttypes.h>
- #include <assert.h>
  
--#include "config.h" // Needed for WORDS_BIGENDIAN
-+#include "config.h" /* Needed for WORDS_BIGENDIAN */
- #include "nav_types.h"
- #include "nav_print.h"
+ #include "md5.h"
+-//#include "unlocked-io.h"
++/* #include "unlocked-io.h" */
  
+ #ifdef _LIBC
+ # include <endian.h>
+--- src/input/libdvdread/nav_print.c	2003-01-07 21:58:15.000000000 +0100
++++ src/input/libdvdread/nav_print.c	2003-02-28 14:12:36.000000000 +0100
 @@ -167,7 +167,7 @@
  	printf("left %d, ", btni->left);
  	printf("right %d\n", btni->right);
@@ -822,8 +656,8 @@ diff -urN libdvdread.cvs/ifo_types.h libdvdread.new/ifo_types.h
  	printf("\n");
        }
      }
---- src/input/libdvdread/nav_print.h	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/nav_print.h	2002-11-27 21:50:03.000000000 +0100
+--- src/input/libdvdread/nav_print.h	2002-07-26 23:20:28.000000000 +0200
++++ src/input/libdvdread/nav_print.h	2003-02-28 14:12:36.000000000 +0100
 @@ -20,7 +20,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -833,90 +667,46 @@ diff -urN libdvdread.cvs/ifo_types.h libdvdread.new/ifo_types.h
  
  /**
   * Pretty printing of the NAV packets, PCI and DSI structs.
---- src/input/libdvdread/nav_read.c	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/nav_read.c	2002-11-27 21:50:03.000000000 +0100
-@@ -21,15 +21,19 @@
- #include <inttypes.h>
- #include <assert.h>
- 
--#include "config.h" // Needed for WORDS_BIGENDIAN
-+#include "config.h" /* Needed for WORDS_BIGENDIAN */
- #include "bswap.h"
- #include "nav_types.h"
- #include "nav_read.h"
- 
-+/*
-+#define STRICT
-+*/
-+
+--- src/input/libdvdread/nav_read.c	2003-01-07 21:58:15.000000000 +0100
++++ src/input/libdvdread/nav_read.c	2003-02-28 14:49:04.000000000 +0100
+@@ -30,7 +30,7 @@
  void navRead_PCI(pci_t *pci, unsigned char *buffer) {
--  int i, j, k;
-+  int i, j;
+   int i, j;
  
--  assert(sizeof(pci_t) == PCI_BYTES - 1); // -1 for substream id
-+  assert(sizeof(pci_t) == PCI_BYTES - 1); /* -1 for substream id */
+-  CHECK_VALUE(sizeof(pci_t) == PCI_BYTES - 1); // -1 for substream id
++  CHECK_VALUE(sizeof(pci_t) == PCI_BYTES - 1); /* -1 for substream id */
    
    memcpy(pci, buffer, sizeof(pci_t));
  
-@@ -71,6 +75,7 @@
- #endif
- 
- 
-+#ifdef STRICT
-   /* Asserts */
- 
-   /* pci pci gi */ 
-@@ -95,6 +100,7 @@
-   /* pci hli btnit */
-   for(i = 0; i < pci->hli.hl_gi.btngr_ns; i++) {
-     for(j = 0; j < (36 / pci->hli.hl_gi.btngr_ns); j++) {
-+      int k;
-       int n = (36 / pci->hli.hl_gi.btngr_ns) * i + j;
-       assert(pci->hli.btnit[n].zero1 == 0);
-       assert(pci->hli.btnit[n].zero2 == 0);
-@@ -110,7 +116,7 @@
- 	assert(pci->hli.btnit[n].down <= pci->hli.hl_gi.btn_ns);
- 	assert(pci->hli.btnit[n].left <= pci->hli.hl_gi.btn_ns);
- 	assert(pci->hli.btnit[n].right <= pci->hli.hl_gi.btn_ns);
+@@ -126,7 +126,7 @@
+ 	CHECK_VALUE(pci->hli.btnit[n].down <= pci->hli.hl_gi.btn_ns);
+ 	CHECK_VALUE(pci->hli.btnit[n].left <= pci->hli.hl_gi.btn_ns);
+ 	CHECK_VALUE(pci->hli.btnit[n].right <= pci->hli.hl_gi.btn_ns);
 -	//vmcmd_verify(pci->hli.btnit[n].cmd);
-+	/* vmcmd_verify(pci->hli.btnit[n].cmd); */
++	/*vmcmd_verify(pci->hli.btnit[n].cmd);*/
        } else {
- 	assert(pci->hli.btnit[n].btn_coln == 0);
- 	assert(pci->hli.btnit[n].auto_action_mode == 0);
-@@ -123,16 +129,17 @@
- 	assert(pci->hli.btnit[n].left == 0);
- 	assert(pci->hli.btnit[n].right == 0);
+ 	int k;
+ 	CHECK_VALUE(pci->hli.btnit[n].btn_coln == 0);
+@@ -140,7 +140,7 @@
+ 	CHECK_VALUE(pci->hli.btnit[n].left == 0);
+ 	CHECK_VALUE(pci->hli.btnit[n].right == 0);
  	for (k = 0; k < 8; k++)
--	  assert(pci->hli.btnit[n].cmd.bytes[k] == 0); //CHECK_ZERO?
-+	  assert(pci->hli.btnit[n].cmd.bytes[k] == 0); /* CHECK_ZERO? */
+-	  CHECK_VALUE(pci->hli.btnit[n].cmd.bytes[k] == 0); //CHECK_ZERO?
++	  CHECK_VALUE(pci->hli.btnit[n].cmd.bytes[k] == 0); /* CHECK_ZERO? */
        }
      }
    }
-+#endif
- }
- 
+@@ -150,7 +150,7 @@
  void navRead_DSI(dsi_t *dsi, unsigned char *buffer) {
    int i;
  
--  assert(sizeof(dsi_t) == DSI_BYTES - 1); // -1 for substream id
-+  assert(sizeof(dsi_t) == DSI_BYTES - 1); /* -1 for substream id */
+-  CHECK_VALUE(sizeof(dsi_t) == DSI_BYTES - 1); // -1 for substream id
++  CHECK_VALUE(sizeof(dsi_t) == DSI_BYTES - 1); /* -1 for substream id */
    
    memcpy(dsi, buffer, sizeof(dsi_t));
  
-@@ -178,9 +185,11 @@
-     B2N_32(dsi->synci.sp_synca[i]);
- 
-   
-+#ifdef STRICT
-   /* Asserts */
- 
-   /* dsi dsi gi */
-   assert(dsi->dsi_gi.zero1 == 0);
-+#endif
- }
- 
---- src/input/libdvdread/nav_read.h	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/nav_read.h	2002-11-27 21:50:03.000000000 +0100
+--- src/input/libdvdread/nav_read.h	2002-07-26 23:04:05.000000000 +0200
++++ src/input/libdvdread/nav_read.h	2003-02-28 14:12:36.000000000 +0100
 @@ -19,7 +19,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -926,8 +716,8 @@ diff -urN libdvdread.cvs/ifo_types.h libdvdread.new/ifo_types.h
  
  /**
   * Parsing of NAV data, PCI and DSI parts.
---- src/input/libdvdread/nav_types.h	2002-11-27 21:56:47.000000000 +0100
-+++ src/input/libdvdread/nav_types.h	2002-11-27 21:55:06.000000000 +0100
+--- src/input/libdvdread/nav_types.h	2003-01-02 21:11:06.000000000 +0100
++++ src/input/libdvdread/nav_types.h	2003-02-28 14:12:36.000000000 +0100
 @@ -30,7 +30,7 @@
   */