diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-03-16 11:43:38 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-03-16 11:43:38 +0000 |
| commit | 50a26e7dabcb36c002f8527c8364c67439adbb11 (patch) | |
| tree | d79ee798b6681d0fc8e8a3c93c845d34cfdb92e4 /src/input/libdvdnav/diff_against_cvs.patch | |
| parent | b323267b7a8f5592c66158376a1ce25e2bdfefd5 (diff) | |
| download | xine-lib-50a26e7dabcb36c002f8527c8364c67439adbb11.tar.gz xine-lib-50a26e7dabcb36c002f8527c8364c67439adbb11.tar.bz2 | |
sync to latest libdvdnav
* fixes a menu problem (German RC2 of "Anatomie", chapter menu)
* addresses some compilation problems on Windows
(Could someone try cygwin, mingw builds, please? It should work with the
standalone libdvdnav, but who knows if the integration breaks anything...)
* turns some abort()s into assert(0)s, where we really can try to continue
CVS patchset: 6269
CVS date: 2004/03/16 11:43:38
Diffstat (limited to 'src/input/libdvdnav/diff_against_cvs.patch')
| -rw-r--r-- | src/input/libdvdnav/diff_against_cvs.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch index 607923d4d..137c14478 100644 --- a/src/input/libdvdnav/diff_against_cvs.patch +++ b/src/input/libdvdnav/diff_against_cvs.patch @@ -1,6 +1,6 @@ --- src/input/libdvdnav/dvdnav.c +++ src/input/libdvdnav/dvdnav.c -@@ -71,7 +71,7 @@ +@@ -67,7 +67,7 @@ struct timeval time; /* Create a new structure */ @@ -11,7 +11,7 @@ this = (dvdnav_t*)malloc(sizeof(dvdnav_t)); --- src/input/libdvdnav/dvd_reader.c +++ src/input/libdvdnav/dvd_reader.c -@@ -44,6 +44,7 @@ +@@ -60,6 +60,7 @@ #include <mntent.h> #endif @@ -19,7 +19,7 @@ #include "dvd_udf.h" #include "dvd_input.h" #include "dvd_reader.h" -@@ -393,7 +394,7 @@ +@@ -408,7 +409,7 @@ if( cdir >= 0 ) { chdir( path_copy ); @@ -28,7 +28,7 @@ fchdir( cdir ); close( cdir ); if( new_path ) { -@@ -573,7 +574,7 @@ +@@ -594,7 +595,7 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename ) { @@ -37,7 +37,7 @@ const char *nodirfile; int ret; -@@ -607,7 +608,7 @@ +@@ -628,7 +629,7 @@ */ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename ) { @@ -46,7 +46,7 @@ dvd_file_t *dvd_file; struct stat fileinfo; dvd_input_t dev; -@@ -691,7 +692,7 @@ +@@ -721,7 +722,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu ) { char filename[ MAX_UDF_FILE_NAME_LEN ]; |