Some discs (usually same ones with padding cells), also have empty
padding PTTs / chapters to accompany them. This results, for example,
in an extra chapter marker that starts and ends at 0 (no duration).
Don't add these empty chapter markers.
Signed-off-by: Marth64 <mart...@proxyid.net>
---
libavformat/dvdvideodec.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c
index f5b7dd33e5..0bf1a82ef9 100644
--- a/libavformat/dvdvideodec.c
+++ b/libavformat/dvdvideodec.c
@@ -874,6 +874,9 @@ static int dvdvideo_chapters_setup_simple(AVFormatContext
*s)
for (int i = chapter_start - 1; i < chapter_end; i++) {
uint64_t time_effective = c->play_state.pgc_pg_times_est[i] -
c->play_state.nav_pts;
+ if (time_effective - time_prev == 0)
+ continue;
+
if (chapter_start != chapter_end &&
!avpriv_new_chapter(s, i, DVDVIDEO_TIME_BASE_Q, time_prev,
time_effective, NULL)) {
@@ -934,13 +937,16 @@ static int
dvdvideo_chapters_setup_preindex(AVFormatContext *s)
continue;
}
- if (!avpriv_new_chapter(s, nb_chapters, DVDVIDEO_TIME_BASE_Q,
cur_chapter_offset,
- cur_chapter_offset + cur_chapter_duration,
NULL)) {
- ret = AVERROR(ENOMEM);
- goto end_close;
+ if (cur_chapter_duration > 0) {
+ if (!avpriv_new_chapter(s, nb_chapters, DVDVIDEO_TIME_BASE_Q,
cur_chapter_offset,
+ cur_chapter_offset + cur_chapter_duration,
NULL)) {
+ ret = AVERROR(ENOMEM);
+ goto end_close;
+ }
+
+ nb_chapters++;
}
- nb_chapters++;
cur_chapter_offset += cur_chapter_duration;
cur_chapter_duration = state.vobu_duration;
last_ptt = state.ptt;
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
