[vlc-commits] commit: Matroska : Set default compression type for the ContentCompAlgo element to 0 ( indicating zlib). Some muxers (for example mkvmerge v4.0.0) do not write ebml elements which correspond to the default values ( as defined in the spec). (Jai Menon )

git at videolan.org git at videolan.org
Fri Jun 11 17:07:33 CEST 2010


vlc | branch: master | Jai Menon <jmenon86 at gmail.com> | Fri Jun 11 18:56:22 2010 +0530| [4a1e7bbf6252f9bd5a6a93639163bad79c6e4dae] | committer: Jean-Baptiste Kempf 

Matroska : Set default compression type for the ContentCompAlgo element to 0 (indicating zlib). Some muxers (for example mkvmerge v4.0.0) do not write ebml elements which correspond to the default values (as defined in the spec).

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

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

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

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index 1abec2b..3e1edc0 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -395,6 +395,8 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
                         {
                             EbmlMaster *compr = static_cast<EbmlMaster*>(l3);
                             MkvTree( sys.demuxer, 5, "Content Compression" );
+                            //Default compression type is 0 (Zlib)
+                            tk->i_compression_type = MATROSKA_COMPRESSION_ZLIB;
                             for( size_t n = 0; n < compr->ListSize(); n++ )
                             {
                                 EbmlElement *l4 = (*compr)[n];



More information about the vlc-commits mailing list