summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2002-08-31 15:38:10 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2002-08-31 15:38:10 +0000
commita8ace67f22ee381e2195e410ec136d3d67f209fb (patch)
tree3d22a9026c7817e6c387a4338e6d9f25730c1927
parent11bac2b5a6fa4947f17b9cb73c49b6df2143cd90 (diff)
downloadxine-lib-a8ace67f22ee381e2195e410ec136d3d67f209fb.tar.gz
xine-lib-a8ace67f22ee381e2195e410ec136d3d67f209fb.tar.bz2
incorporate James' latest changes into the patch
CVS patchset: 2569 CVS date: 2002/08/31 15:38:10
-rw-r--r--src/input/libdvdnav/diff_against_cvs.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch
index 25876c5d6..d1855aefc 100644
--- a/src/input/libdvdnav/diff_against_cvs.patch
+++ b/src/input/libdvdnav/diff_against_cvs.patch
@@ -36,6 +36,15 @@
#include <stdlib.h>
#include <stdio.h>
+@@ -177,7 +177,7 @@
+ dvdnav_t *this;
+
+ /* Create a new structure */
+- fprintf(MSG_OUT, "libdvdnav: Using dvdnav version from http://dvd.sf.net\n");
++ fprintf(MSG_OUT, "libdvdnav: Using dvdnav version from http://xine.sf.net\n");
+
+ /* FIXME: We malloc() here, but if an error occurs inside dvdnav_open(),
+ * we return but never free() it.
--- 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 @@