Commit d84b8db9 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: use dvdnav fork on github

Bored as hell of those crashes...
parent 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
# DVDNAV # DVDNAV
LIBDVDNAV_VERSION := 4.2.0 # LIBDVDNAV_VERSION := 4.2.0
LIBDVDNAV_URL := http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 # 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 ifdef BUILD_DISCS
PKGS += dvdnav PKGS += dvdnav
...@@ -10,15 +12,19 @@ ifeq ($(call need_pkg,"dvdnav"),) ...@@ -10,15 +12,19 @@ ifeq ($(call need_pkg,"dvdnav"),)
PKGS_FOUND += dvdnav PKGS_FOUND += dvdnav
endif endif
$(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2: $(TARBALLS)/libdvdnav-git.tar.xz:
$(call download,$(LIBDVDNAV_URL)) $(call download_git,$(DVDNAV_GITURL))
.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) $(UNPACK)
$(APPLY) $(SRC)/dvdnav/dvdnav.patch $(APPLY) $(SRC)/dvdnav/dvdnav.patch
$(APPLY) $(SRC)/dvdnav/libdvdnav-searching.c-check-cellnr-before-indexing.patch
$(MOVE) $(MOVE)
DEPS_dvdnav = dvdcss dvdread DEPS_dvdnav = dvdcss dvdread
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment