[vlc-commits] demux/mkv: fix chapter publication condition

Filip Roséen git at videolan.org
Sun Dec 4 11:42:10 CET 2016


vlc | branch: master | Filip Roséen <filip at atch.se> | Sun Dec  4 11:35:04 2016 +0100| [006237604fa557245ab6a89ccb2453b3c86cb6bf] | committer: Jean-Baptiste Kempf

demux/mkv: fix chapter publication condition

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

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

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

diff --git a/modules/demux/mkv/virtual_segment.cpp b/modules/demux/mkv/virtual_segment.cpp
index a48c1b3..823f6d5 100644
--- a/modules/demux/mkv/virtual_segment.cpp
+++ b/modules/demux/mkv/virtual_segment.cpp
@@ -599,9 +599,7 @@ int virtual_chapter_c::PublishChapters( input_title_t & title, int & i_user_chap
             p_chapter->b_display_seekpoint = true;
     }
 
-    if ( ( p_chapter && p_chapter->b_display_seekpoint &&
-         ( ( sub_vchapters.size() > 0 && i_mk_virtual_start_time != sub_vchapters[0]->i_mk_virtual_start_time) ||
-           sub_vchapters.size() == 0 ) ) )
+    if ( p_chapter && p_chapter->b_display_seekpoint )
     {
         if( p_chapter->b_user_display )
         {
@@ -636,7 +634,6 @@ int virtual_edition_c::PublishChapters( input_title_t & title, int & i_user_chap
         vchapters[0]->i_mk_virtual_start_time && p_edition )
     {
         seekpoint_t *sk = vlc_seekpoint_New();
-
         sk->i_time_offset = 0;
         sk->psz_name = strdup( p_edition->psz_name.c_str() );
 



More information about the vlc-commits mailing list