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

Fixes for compiler warnings, errors, and linker errors.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-01-19 20:58:04 +00:00
parent 17e9eb182f
commit bbed6aaecc
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/segmentinfo.h
View File

@ -14,24 +14,19 @@
Steve Lhomme <steve.lhomme@free.fr>.
*/
#ifndef __INFOS_H
#define __INFOS_H
#ifndef __SEGMENTINFO_H
#define __SEGMENTINFO_H
#include <stdio.h>
#include "ebml/EbmlElement.h"
#include "matroska/KaxInfoData.h"
#include "matroska/KaxSegment.h"
#include "common.h"
#include "mm_io.h"
namespace libebml {
class EbmlMaster;
};
namespace libmatroska {
class KaxSegment;
};
using namespace libebml;
using namespace libmatroska;
@ -44,5 +39,5 @@ KaxSegment *MTX_DLL_API parse_xml_segmentinfo(mm_text_io_c *in,
void MTX_DLL_API fix_mandatory_segmentinfo_elements(EbmlElement *e);
#endif // __INFOS_H
#endif // __SEGMENTINFO_H

8
src/common/segmentinfo_parser.cpp
View File

@ -88,8 +88,8 @@ probe_xml_segmentinfos(mm_text_io_c *in) {
}
KaxSegment *
parse_xml_segmentinfos(mm_text_io_c *in,
bool exception_on_error) {
parse_xml_segmentinfo(mm_text_io_c *in,
bool exception_on_error) {
KaxSegment *segment;
EbmlMaster *m;
string error;
@ -108,7 +108,7 @@ parse_xml_segmentinfos(mm_text_io_c *in,
try {
m = parse_xml_elements("Info", segmentinfo_elements, in);
// segment = dynamic_cast<KaxSegment *>(sort_ebml_master(m));
segment = dynamic_cast<KaxSegment *>(sort_ebml_master(m));
assert(segment != NULL);
} catch (error_c e) {
if (!exception_on_error)
@ -123,7 +123,7 @@ parse_xml_segmentinfos(mm_text_io_c *in,
if (error.length() > 0)
throw error_c(error);
// fix_mandatory_segmentsegmentinfo_elements(dynamic_cast<EbmlElement*>(segment));
fix_mandatory_segmentinfo_elements(segment);
return segment;
}