[vlc-devel] commit: Added S_TEXT/ASCII codec to matroska. (Laurent Aimar )

git version control git at videolan.org
Mon Dec 15 22:20:23 CET 2008


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Dec 15 21:49:38 2008 +0100| [428d84df36d459f14aca712781424a16e2cdff11] | committer: Laurent Aimar 

Added S_TEXT/ASCII codec to matroska.

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

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

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 2341d43..fb8172f 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -1033,6 +1033,11 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
                 i_extra += i_size[i];
             }
         }
+        else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/ASCII" ) )
+        {
+            p_fmt->i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
+            p_fmt->subs.psz_encoding = NULL; /* Is there a place where it is stored ? */
+        }
         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