[vlc-devel] [PATCH] fix wrong EBML element checking before a cast

[Steve Lhomme]

clean patch formating...

---
 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 ) )
-- 
1.9.5.msysgit.0



On Fri, Feb 20, 2015 at 11:53 AM, Steve Lhomme <robux4 at gmail.com> wrote:

>  Fix a silly typo and loads Tags the first time we see them, during the
> Preload phase.
>
> ---
> 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( 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( el ) );*/
> + if( i_tags_position < 0)
> + LoadTags( static_cast( el ) );
> i_tags_position = (int64_t) es.I_O().getFilePointer();
> }
> else if( MKV_IS_ID( el, EbmlVoid ) )
> --
> 1.9.5.msysgit.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20150220/307dfe86/attachment.html>