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

Unknown elements are properly skipped now.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-08-12 12:46:12 +00:00
parent a2a6ad5ff8
commit 9d6e715f78
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2003-08-12 Moritz Bunkus <moritz@bunkus.org>
* mkvinfo: Unknown elements are properly skipped now.
2003-08-11 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: For RV40 (RealVideo 9) the actual video dimensions are

16
src/mkvinfo.cpp
View File

@ -154,7 +154,8 @@ void show_error(const char *fmt, ...) {
mxprint(stdout, "(%s) %s\n", NAME, args_buffer);
}
void show_element(EbmlElement *l, int level, const char *fmt, ...) {
void _show_element(EbmlElement *l, EbmlStream *es, bool skip, int level,
const char *fmt, ...) {
va_list ap;
char level_buffer[10];
@ -183,11 +184,17 @@ void show_element(EbmlElement *l, int level, const char *fmt, ...) {
frame->add_item(level, args_buffer);
}
#endif // HAVE_WXWINDOWS
if ((l != NULL) && skip)
l->SkipData(*es, l->Generic().Context);
}
#define show_warning(l, f, args...) show_element(NULL, l, f, ## args)
#define show_warning(l, f, args...) _show_element(NULL, NULL, false, l, f, \
## args)
#define show_unknown_element(e, l) \
show_element(e, l, "Unknown element: %s", e->Generic().DebugName)
_show_element(e, es, true, l, "Unknown element: %s", e->Generic().DebugName)
#define show_element(e, l, s, args...) _show_element(e, es, false, l, s, \
## args)
// }}}
@ -236,7 +243,8 @@ void parse_args(int argc, char **argv, char *&file_name, bool &use_gui) {
#define in_parent(p) (in->getFilePointer() < \
(p->GetElementPosition() + p->ElementSize()))
bool is_global(EbmlElement *l, int level, int &upper_lvl_el) {
#define is_global(l, lvl, ule) _is_global(l, es, lvl, ule)
bool _is_global(EbmlElement *l, EbmlStream *es, int level, int &upper_lvl_el) {
if (upper_lvl_el < 0)
upper_lvl_el = 0;