diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-09-20 12:53:53 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-09-20 12:53:53 +0000 |
| commit | 0c7d2678ef70026fa05b3b0921a149d1c0e5ebfb (patch) | |
| tree | 534a685276a6f33fe77692a721530a927b95185c /src/input/libdvdnav/diff_against_cvs.patch | |
| parent | 44a2823e79fcf9b1002f7bf537fc9c7a9b7913b3 (diff) | |
| download | xine-lib-0c7d2678ef70026fa05b3b0921a149d1c0e5ebfb.tar.gz xine-lib-0c7d2678ef70026fa05b3b0921a149d1c0e5ebfb.tar.bz2 | |
sync to latest libdvdnav cvs version
CVS patchset: 2718
CVS date: 2002/09/20 12:53:53
Diffstat (limited to 'src/input/libdvdnav/diff_against_cvs.patch')
| -rw-r--r-- | src/input/libdvdnav/diff_against_cvs.patch | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch index 331435d00..df4658ee3 100644 --- a/src/input/libdvdnav/diff_against_cvs.patch +++ b/src/input/libdvdnav/diff_against_cvs.patch @@ -36,23 +36,25 @@ #include <stdlib.h> #include <stdio.h> -@@ -179,7 +179,7 @@ +@@ -181,7 +181,7 @@ struct timeval time; /* Create a new structure */ -- fprintf(MSG_OUT, "libdvdnav: Using dvdnav version (devel-ref:jcd1) from http://dvd.sf.net\n"); -+ fprintf(MSG_OUT, "libdvdnav: Using dvdnav version (devel-ref:jcd1) from http://xine.sf.net\n"); +- fprintf(MSG_OUT, "libdvdnav: Using dvdnav version %s from http://dvd.sf.net\n", VERSION); ++ fprintf(MSG_OUT, "libdvdnav: Using dvdnav version %s from http://xine.sf.net\n", VERSION); - /* FIXME: We malloc() here, but if an error occurs inside dvdnav_open(), - * we return but never free() it. + (*dest) = NULL; + this = (dvdnav_t*)malloc(sizeof(dvdnav_t)); --- src/input/libdvdnav/dvdnav.h Thu Jul 25 17:26:00 2002 +++ src/input/libdvdnav/dvdnav.h Fri Aug 9 22:01:19 2002 -@@ -40,7 +40,7 @@ +@@ -40,8 +40,8 @@ /* Various useful types */ #include "dvd_types.h" -#include <dvdread/dvd_reader.h> +-#include <dvdread/ifo_types.h> /* For vm_cmd_t */ +#include "dvd_reader.h" ++#include "ifo_types.h" /* For vm_cmd_t */ /** * Opaque data-type can be viewed as a 'DVD handle'. You should get @@ -124,9 +126,9 @@ --- src/input/libdvdnav/vm.c Sat Jul 6 18:12:09 2002 +++ src/input/libdvdnav/vm.c Fri Aug 9 22:03:48 2002 -@@ -34,8 +34,8 @@ - #include <inttypes.h> - #include <assert.h> +@@ -37,8 +37,8 @@ + #include <sys/stat.h> + #include <fcntl.h> -#include <dvdread/ifo_types.h> -#include <dvdread/ifo_read.h> |