Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 20:01:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow libmatroska to return/handle unknown elements.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-04-21 19:42:26 +00:00
parent d2939e6841
commit 302e981225
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-04-21 Moritz Bunkus <moritz@bunkus.org>
* mkvinfo: bug fix: mkvinfo was forcing libmatroska not to handle
unknown elements and crashed on those.
2004-04-15 Moritz Bunkus <moritz@bunkus.org> 2004-04-15 Moritz Bunkus <moritz@bunkus.org>
* mmg: new feature: When adding Matroska files the video track's * mmg: new feature: When adding Matroska files the video track's

3
src/mkvinfo.cpp
View File

@ -577,7 +577,7 @@ void sort_master(EbmlMaster &m) {
void read_master(EbmlMaster *m, EbmlStream *es, const EbmlSemanticContext &ctx, void read_master(EbmlMaster *m, EbmlStream *es, const EbmlSemanticContext &ctx,
int &upper_lvl_el, EbmlElement *&l2) { int &upper_lvl_el, EbmlElement *&l2) {
m->Read(*es, ctx, upper_lvl_el, l2, false); m->Read(*es, ctx, upper_lvl_el, l2, true);
if (m->ListSize() == 0) if (m->ListSize() == 0)
return; return;
@ -682,7 +682,6 @@ bool process_file(const char *file_name) {
l1 = es->FindNextElement(l0->Generic().Context, upper_lvl_el, 0xFFFFFFFFL, l1 = es->FindNextElement(l0->Generic().Context, upper_lvl_el, 0xFFFFFFFFL,
true); true);
while ((l1 != NULL) && (upper_lvl_el <= 0)) { while ((l1 != NULL) && (upper_lvl_el <= 0)) {
if (is_id(l1, KaxInfo)) { if (is_id(l1, KaxInfo)) {
// General info about this Matroska file // General info about this Matroska file
show_element(l1, 1, "Segment information"); show_element(l1, 1, "Segment information");