[vlc-commits] MKV: fix wrong EBML element checking before a cast

Steve Lhomme git at videolan.org
Fri Feb 20 14:46:24 CET 2015


vlc | branch: master | Steve Lhomme <robux4 at gmail.com> | Fri Feb 20 14:40:01 2015 +0100| [5dfb4af71eb6f734415d689edc442d19eeb41eb7] | committer: Jean-Baptiste Kempf

MKV: fix wrong EBML element checking before a cast

Fix a silly typo and loads Tags the first time we see them, during the
Preload phase.

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

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

 modules/demux/mkv/matroska_segment.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 904a12f..eac5a54 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -726,11 +726,11 @@ bool matroska_segment_c::Preload( )
                 ParseChapters( static_cast<KaxChapters*>( el ) );
             i_chapters_position = (int64_t) es.I_O().getFilePointer();
         }
-        else if( MKV_IS_ID( el, KaxTag ) )
+        else if( MKV_IS_ID( el, KaxTags ) )
         {
             msg_Dbg( &sys.demuxer, "|   + Tags" );
-            /*FIXME if( i_tags_position < 0)
-                LoadTags( static_cast<KaxTags*>( el ) );*/
+            if( i_tags_position < 0)
+                LoadTags( static_cast<KaxTags*>( el ) );
             i_tags_position = (int64_t) es.I_O().getFilePointer();
         }
         else if( MKV_IS_ID( el, EbmlVoid ) )



More information about the vlc-commits mailing list