[vlc-devel] commit: Do not skip non finite size element in matroska. (Laurent Aimar )

git version control git at videolan.org
Mon Jun 29 11:39:59 CEST 2009


vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Sun Jun 28 23:05:34 2009 +0200| [72990e3fab82009c80c16c52c33f490ae0ddd73b] | committer: Derk-Jan Hartman 

Do not skip non finite size element in matroska.

It seems to create an infinite loop.
(cherry picked from commit a1fa34871cd4f14a3fe7e78112a1176055eac16c)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

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

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

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index 2199b11..aa15ea7 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -160,7 +160,9 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS
             p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL);
         }
         else
-            p_l0 = p_l0->SkipData(*p_estream, KaxSegment_Context);
+        {
+            p_l0 = NULL;
+        }
     }
 
     if ( !b_keep_stream )




More information about the vlc-devel mailing list