[vlc-commits] Revert "mkv: a subchapter with no end timestamp cannot match the chapter looked for"

Steve Lhomme git at videolan.org
Fri Mar 25 08:53:12 CET 2016


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Thu Mar 17 17:47:20 2016 +0100| [876534b7525cd5f120687fe4c37ca4a1db80d11e] | committer: Jean-Baptiste Kempf

Revert "mkv: a subchapter with no end timestamp cannot match the chapter looked for"

This reverts commit 8dd38a675a018911e1000bf95ed9f8bdde4f9350.

We want stricter rules for which chapter holds the timestamp

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=876534b7525cd5f120687fe4c37ca4a1db80d11e
---

 modules/demux/mkv/virtual_segment.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/demux/mkv/virtual_segment.cpp b/modules/demux/mkv/virtual_segment.cpp
index f59ff9a..b1e7508 100644
--- a/modules/demux/mkv/virtual_segment.cpp
+++ b/modules/demux/mkv/virtual_segment.cpp
@@ -383,8 +383,7 @@ virtual_chapter_c * virtual_chapter_c::BrowseCodecPrivate( unsigned int codec_id
 bool virtual_chapter_c::ContainsTimestamp( int64_t time )
 {
     /*with the current implementation only the last chapter can have a negative virtual_stop_time*/
-    return ( time >= i_mk_virtual_start_time &&
-        ( i_mk_virtual_stop_time < 0 || time < i_mk_virtual_stop_time ) );
+    return ( time >= i_mk_virtual_start_time && time < i_mk_virtual_stop_time );
 }
 
 virtual_chapter_c* virtual_chapter_c::getSubChapterbyTimecode( int64_t time )



More information about the vlc-commits mailing list