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
d84b8db9
Commit
d84b8db9
authored
Sep 04, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: use dvdnav fork on github
Bored as hell of those crashes...
parent
2db381f6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
24 deletions
+13
-24
contrib/src/dvdnav/libdvdnav-searching.c-check-cellnr-before-indexing.patch
.../libdvdnav-searching.c-check-cellnr-before-indexing.patch
+0
-17
contrib/src/dvdnav/rules.mak
contrib/src/dvdnav/rules.mak
+13
-7
No files found.
contrib/src/dvdnav/libdvdnav-searching.c-check-cellnr-before-indexing.patch
deleted
100644 → 0
View file @
2db381f6
diff --git a/src/searching.c b/src/searching.c
index 3649e9d..0b5f22a 100644
--- a/src/searching.c
+++ b/src/searching.c
@@ -640,7 +640,11 @@
uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t
goto fail;
}
- cellnr = pgc->program_map[ptt[i].pgn-1];
+ if ((cellnr = pgc->program_map[ptt[i].pgn-1]) == 0) {
+ printerr("Cell new row cannot be 0");
+ continue;
+ }
+
if(ptt[i].pgn < pgc->nr_of_programs)
endcellnr = pgc->program_map[ptt[i].pgn];
else
contrib/src/dvdnav/rules.mak
View file @
d84b8db9
# DVDNAV
LIBDVDNAV_VERSION
:=
4.2.0
LIBDVDNAV_URL
:=
http://dvdnav.mplayerhq.hu/releases/libdvdnav-
$(LIBDVDNAV_VERSION)
.tar.bz2
# LIBDVDNAV_VERSION := 4.2.0
# LIBDVDNAV_URL := http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
DVDNAV_GITURL
:=
git://github.com/microe/libdvdnav
LIBDVDNAV_VERSION
:=
git
ifdef
BUILD_DISCS
PKGS
+=
dvdnav
...
...
@@ -10,15 +12,19 @@ ifeq ($(call need_pkg,"dvdnav"),)
PKGS_FOUND
+=
dvdnav
endif
$(TARBALLS)/libdvdnav-
$(LIBDVDNAV_VERSION).tar.bz2
:
$(
call
download
,
$(LIBDVDNAV_
URL)
)
$(TARBALLS)/libdvdnav-
git.tar.xz
:
$(
call
download
_git,
$(DVDNAV_GIT
URL)
)
.sum-dvdnav
:
libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
# $(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
# $(call download,$(LIBDVDNAV_URL))
dvdnav
:
libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav
.sum-dvdnav
:
libdvdnav-$(LIBDVDNAV_VERSION).tar.xz
$(
warning
$@
not implemented
)
touch
$@
dvdnav
:
libdvdnav-$(LIBDVDNAV_VERSION).tar.xz .sum-dvdnav
$(UNPACK)
$(APPLY)
$(SRC)
/dvdnav/dvdnav.patch
$(APPLY)
$(SRC)
/dvdnav/libdvdnav-searching.c-check-cellnr-before-indexing.patch
$(MOVE)
DEPS_dvdnav
=
dvdcss dvdread
...
...
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