Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
1b1c1a73
Commit
1b1c1a73
authored
Sep 09, 2008
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: update the libdvdnav patch, which was broken after upstream changes.
(cherry picked from commit
8a0180f5
)
parent
e2c94f83
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
16 deletions
+7
-16
extras/contrib/src/Patches/libdvdnav.patch
extras/contrib/src/Patches/libdvdnav.patch
+7
-16
No files found.
extras/contrib/src/Patches/libdvdnav.patch
View file @
1b1c1a73
Index: src/vm/vm.c
Index: src/vm/vm.c
===================================================================
===================================================================
--- src/vm/vm.c (revision 1
09
6)
--- src/vm/vm.c (revision 1
13
6)
+++ src/vm/vm.c (working copy)
+++ src/vm/vm.c (working copy)
@@ -139,19 +139,18 @@
@@ -146,12 +146,11 @@
* all off_t are 64bit.
*/
off_t off;
- int fd, i;
+ int i, fd;
uint8_t data[DVD_VIDEO_LB_LEN];
/* Read DVD name */
fd = open(device, O_RDONLY);
fd = open(device, O_RDONLY);
if (fd > 0) {
if (fd > 0) {
off = lseek( fd, 32 * (off_t) DVD_VIDEO_LB_LEN, SEEK_SET );
off = lseek( fd, 32 * (off_t) DVD_VIDEO_LB_LEN, SEEK_SET );
- if( off == ( 32 * (off_t) DVD_VIDEO_LB_LEN ) ) {
- if( off == ( 32 * (off_t) DVD_VIDEO_LB_LEN ) ) {
- off = read( fd, data, DVD_VIDEO_LB_LEN );
+ if (off == 16) {
off = read( fd, data, DVD_VIDEO_LB_LEN );
- close(fd);
- close(fd);
+ if( off == 16 ) {
+ off = read( fd, data, DVD_VIDEO_LB_LEN );
if (off == ( (off_t) DVD_VIDEO_LB_LEN )) {
if (off == ( (off_t) DVD_VIDEO_LB_LEN )) {
fprintf(MSG_OUT, "libdvdnav: DVD Title: ");
fprintf(MSG_OUT, "libdvdnav: DVD Title: ");
- for(i=25; i < 73; i++ ) {
- for(i=25; i < 73; i++ ) {
...
@@ -34,7 +25,7 @@ Index: src/vm/vm.c
...
@@ -34,7 +25,7 @@ Index: src/vm/vm.c
- name[48] = 0;
- name[48] = 0;
+ strncpy(name, (char*) &data[40], 32);
+ strncpy(name, (char*) &data[40], 32);
+ i=31;
+ i=31;
+ while( (i
>=
0) && (name[i] <= ' ')) --i;
+ while( (i
>=
0) && (name[i] <= ' ')) --i;
+ name[i+1] = '\0';
+ name[i+1] = '\0';
fprintf(MSG_OUT, "\nlibdvdnav: DVD Serial Number: ");
fprintf(MSG_OUT, "\nlibdvdnav: DVD Serial Number: ");
- for(i=73; i < 89; i++ ) {
- for(i=73; i < 89; i++ ) {
...
@@ -44,7 +35,7 @@ Index: src/vm/vm.c
...
@@ -44,7 +35,7 @@ Index: src/vm/vm.c
fprintf(MSG_OUT, "%c", data[i]);
fprintf(MSG_OUT, "%c", data[i]);
Index: Makefile.am
Index: Makefile.am
===================================================================
===================================================================
--- Makefile.am (revision 11
00
)
--- Makefile.am (revision 11
36
)
+++ Makefile.am (working copy)
+++ Makefile.am (working copy)
@@ -1,7 +1,7 @@
@@ -1,7 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
include $(top_srcdir)/misc/Makefile.common
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment