dvdnav.patch 1.68 KB
Newer Older
Jean-Baptiste Kempf's avatar
Jean-Baptiste Kempf committed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff -ruN dvdnav-svn/Makefile.am dvdnav/Makefile.am
--- dvdnav-svn/Makefile.am	2008-06-18 17:06:33.000000000 +0200
+++ dvdnav/Makefile.am	2011-08-06 18:38:10.243875945 +0200
@@ -1,7 +1,7 @@
 include $(top_srcdir)/misc/Makefile.common
 
 
-SUBDIRS = src examples doc misc m4
+SUBDIRS = src misc m4
 
 EXTRA_DIST = autogen.sh \
 	     AUTHORS \
diff -ruN dvdnav-svn/src/vm/vm.c dvdnav/src/vm/vm.c
--- dvdnav-svn/src/vm/vm.c	2010-11-22 00:59:43.000000000 +0100
+++ dvdnav/src/vm/vm.c	2011-08-06 18:38:03.263841341 +0200
@@ -174,12 +174,11 @@
     fd = open(device, O_RDONLY);
     if (fd > 0) {
       off = lseek( fd, 32 * (off_t) DVD_VIDEO_LB_LEN, SEEK_SET );
-      if( off == ( 32 * (off_t) DVD_VIDEO_LB_LEN ) ) {
+      if (off == 16) {
         off = read( fd, data, DVD_VIDEO_LB_LEN );
-        close(fd);
         if (off == ( (off_t) DVD_VIDEO_LB_LEN )) {
           fprintf(MSG_OUT, "libdvdnav: DVD Title: ");
-          for(i=25; i < 73; i++ ) {
+          for(i=40; i < 73; i++ ) {
             if((data[i] == 0)) break;
             if((data[i] > 32) && (data[i] < 127)) {
               fprintf(MSG_OUT, "%c", data[i]);
@@ -187,10 +186,12 @@
               fprintf(MSG_OUT, " ");
             }
           }
-          strncpy(name, (char*) &data[25], 48);
-          name[48] = 0;
+          strncpy(name, (char*) &data[40], 32);
+          i=31;
+          while( (i>=0) && (name[i] <= ' ')) --i;
+          name[i+1] = '\0';
           fprintf(MSG_OUT, "\nlibdvdnav: DVD Serial Number: ");
-          for(i=73; i < 89; i++ ) {
+          for(i=813; i < 829; i++ ) {
             if((data[i] == 0)) break;
             if((data[i] > 32) && (data[i] < 127)) {
               fprintf(MSG_OUT, "%c", data[i]);