[MPlayer-cvslog] CVS: main/libmpdvdkit2 libdvdread_changes.diff, 1.9, 1.10 dvd_input.c, 1.6, 1.7

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdvdkit2
In directory mail:/var2/tmp/cvs-serv20676

Modified Files:
	libdvdread_changes.diff dvd_input.c 
Log Message:
fix another sizeof(dvd_input_t) bug (must be struct dvd_input_s instead)


Index: libdvdread_changes.diff
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit2/libdvdread_changes.diff,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libdvdread_changes.diff	4 Jan 2006 15:31:01 -0000	1.9
+++ libdvdread_changes.diff	9 Mar 2006 17:39:34 -0000	1.10
@@ -91,6 +91,15 @@
    if(dev == NULL) {
      fprintf(stderr, "libdvdread: Could not allocate memory.\n");
      return NULL;
+@@ -158,7 +158,7 @@
+   dvd_input_t dev;
+   
+   /* Allocate the library structure */
+-  dev = (dvd_input_t) malloc(sizeof(dvd_input_t));
++  dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s));
+   if(dev == NULL) {
+     fprintf(stderr, "libdvdread: Could not allocate memory.\n");
+     return NULL;
 @@ -320,8 +320,10 @@
      fprintf(stderr, "DVDCSS_METHOD %s\n", psz_method);
      fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose);

Index: dvd_input.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit2/dvd_input.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dvd_input.c	30 Jun 2005 22:48:26 -0000	1.6
+++ dvd_input.c	9 Mar 2006 17:39:34 -0000	1.7
@@ -158,7 +158,7 @@
   dvd_input_t dev;
   
   /* Allocate the library structure */
-  dev = (dvd_input_t) malloc(sizeof(dvd_input_t));
+  dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s));
   if(dev == NULL) {
     fprintf(stderr, "libdvdread: Could not allocate memory.\n");
     return NULL;