From: Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
Date: Fri, 4 Jul 2008 10:34:23 +0000 (+0100)
Subject: enable kate in matroska now that the codec id is published
X-Git-Tag: 0.9.0-test2~283
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ad2b7c81d617eb066bc8bc8b87a1ac6f851465ef;p=vlc

enable kate in matroska now that the codec id is published

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
---

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index c0022af1e2..870142e009 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -2554,7 +2554,6 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
             }
             tracks[i_track]->fmt.audio.i_blockalign = ( tracks[i_track]->fmt.audio.i_bitspersample + 7 ) / 8 * tracks[i_track]->fmt.audio.i_channels;
         }
-#if 0
         /* disabled due to the potential "S_KATE" namespace issue */
         else if( !strcmp( tracks[i_track]->psz_codec, "S_KATE" ) )
         {
@@ -2605,7 +2604,6 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
                 i_extra += i_size[i];
             }
         }
-#endif
         else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/UTF8" ) )
         {
             tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );