[vlc-devel] commit: enable kate in matroska now that the codec id is published ( Vincent Penquerc'h )

git version control git at videolan.org
Fri Jul 4 22:48:30 CEST 2008


vlc | branch: master | Vincent Penquerc'h <ogg.k.ogg.k at googlemail.com> | Fri Jul  4 11:34:23 2008 +0100| [ad2b7c81d617eb066bc8bc8b87a1ac6f851465ef]

enable kate in matroska now that the codec id is published

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

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

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

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index c0022af..870142e 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' );




More information about the vlc-devel mailing list