[vlc-commits] Fix block dropping at chapter change for non ordered editions

Denis Charmet git at videolan.org
Thu Aug 18 12:47:51 CEST 2011


vlc | branch: master | Denis Charmet <typx at dinauz.org> | Wed Aug 17 12:41:44 2011 +0200| [05c419f604fd78e458045b6ba10b3402175c8b95] | committer: Jean-Baptiste Kempf

Fix block dropping at chapter change for non ordered editions

The release of the block only makes sense if the edition is ordered.

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

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

 modules/demux/mkv/mkv.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index ff1c423..d1ccfb9 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -720,7 +720,7 @@ static int Demux( demux_t *p_demux)
 
         if( p_sys->i_pts >= p_sys->i_start_pts  )
         {
-            if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
+            if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) && p_vsegment->CurrentEdition() && p_vsegment->CurrentEdition()->b_ordered )
             {
                 i_return = 1;
                 delete block;



More information about the vlc-commits mailing list