diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-10-08 20:44:34 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-10-08 20:44:34 +0000 |
| commit | ab9faee8cb2f4f732ed371a0e28228d3659e5aae (patch) | |
| tree | 1b4aaaf238ee79afa66642fb1e8a1ce7aff0bdac /src/input/libdvdnav/diff_against_cvs.patch | |
| parent | cfc01156e5851256eb337ffd4b734f7bc0d272a1 (diff) | |
| download | xine-lib-ab9faee8cb2f4f732ed371a0e28228d3659e5aae.tar.gz xine-lib-ab9faee8cb2f4f732ed371a0e28228d3659e5aae.tar.bz2 | |
sync to current CVS of libdvdnav
* fixes wrong subtitle appearing in the trailer of "Girl, Interrupted" RC2
* fixes "NAV packet expected, but none found" error when toggling between
menu and feature with the Escape key
CVS patchset: 7022
CVS date: 2004/10/08 20:44:34
Diffstat (limited to 'src/input/libdvdnav/diff_against_cvs.patch')
| -rw-r--r-- | src/input/libdvdnav/diff_against_cvs.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch index 137c14478..39d3de466 100644 --- a/src/input/libdvdnav/diff_against_cvs.patch +++ b/src/input/libdvdnav/diff_against_cvs.patch @@ -11,7 +11,7 @@ this = (dvdnav_t*)malloc(sizeof(dvdnav_t)); --- src/input/libdvdnav/dvd_reader.c +++ src/input/libdvdnav/dvd_reader.c -@@ -60,6 +60,7 @@ +@@ -61,6 +61,7 @@ #include <mntent.h> #endif @@ -19,7 +19,7 @@ #include "dvd_udf.h" #include "dvd_input.h" #include "dvd_reader.h" -@@ -408,7 +409,7 @@ +@@ -409,7 +410,7 @@ if( cdir >= 0 ) { chdir( path_copy ); @@ -28,7 +28,7 @@ fchdir( cdir ); close( cdir ); if( new_path ) { -@@ -594,7 +595,7 @@ +@@ -595,7 +596,7 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename ) { @@ -37,7 +37,7 @@ const char *nodirfile; int ret; -@@ -628,7 +629,7 @@ +@@ -629,7 +630,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; -@@ -721,7 +722,7 @@ +@@ -722,7 +723,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu ) { char filename[ MAX_UDF_FILE_NAME_LEN ]; |