From 8b7418db9730d2e201f49f741756bb0ffec90f37 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 13 Dec 2014 18:40:44 +0100 Subject: dvd: drop last chapter Apparently, libdvdnav always reports a last chapter that points to the exact end of the title. This is useless for us. Again, same possible caveats as with the previous commit. --- stream/stream_dvdnav.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'stream') diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 92252aa5a4..be116e65ba 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -489,7 +489,7 @@ static int control(stream_t *stream, int cmd, void *arg) break; if (!part) break; - *(unsigned int *)arg = part + 1; + *(unsigned int *)arg = part; return 1; } case STREAM_CTRL_GET_CHAPTER_TIME: { @@ -501,7 +501,7 @@ static int control(stream_t *stream, int cmd, void *arg) int n = dvdnav_describe_title_chapters(dvdnav, tit, &parts, &duration); if (!parts) break; - if (chapter < 0 || chapter >= n) + if (chapter < 0 || chapter + 1 >= n) break; *ch = chapter > 0 ? parts[chapter - 1] / 90000.0 : 0; free(parts); -- cgit v1.2.3