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

More VC6 compatibility fixes. More libmatroska 0.4.4 updates.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-06-07 14:30:10 +00:00
parent e7e4b6aa21
commit 840e6fd154
6 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: common.h,v 1.34 2003/06/07 12:26:08 mosu Exp $
\version \$Id: common.h,v 1.35 2003/06/07 14:30:10 mosu Exp $
\brief definitions used in all programs, helper functions
\author Moritz Bunkus <moritz@bunkus.org>
*/
@ -36,6 +36,8 @@
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#define nice(a)
#define vsnprintf _vsnprintf
#define vfprintf _vfprintf
#endif
#include "EbmlUnicodeString.h"

8
mkvinfo.cpp
View File

@ -12,7 +12,7 @@
/*!
\file
\version \$Id: mkvinfo.cpp,v 1.56 2003/06/07 12:26:08 mosu Exp $
\version \$Id: mkvinfo.cpp,v 1.57 2003/06/07 14:30:10 mosu Exp $
\brief retrieves and displays information about a Matroska file
\author Moritz Bunkus <moritz@bunkus.org>
*/
@ -523,10 +523,10 @@ bool process_file(const char *file_name) {
} else if (EbmlId(*l3) == KaxCodecID::ClassInfos.GlobalId) {
KaxCodecID &codec_id = *static_cast<KaxCodecID*>(l3);
codec_id.ReadData(es->I_O());
show_element(l3, 3, "Codec ID: %s", &binary(codec_id));
if ((!strcmp((char *)&binary(codec_id), MKV_V_MSCOMP) &&
show_element(l3, 3, "Codec ID: %s", string(codec_id).c_str());
if ((!strcmp(string(codec_id).c_str(), MKV_V_MSCOMP) &&
(mkv_track_type == 'v')) ||
(!strcmp((char *)&binary(codec_id), MKV_A_ACM) &&
(!strcmp(string(codec_id).c_str(), MKV_A_ACM) &&
(mkv_track_type == 'a')))
ms_compat = true;

4
mkvmerge.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: mkvmerge.cpp,v 1.86 2003/06/07 12:26:08 mosu Exp $
\version \$Id: mkvmerge.cpp,v 1.87 2003/06/07 14:30:10 mosu Exp $
\brief command line parameter parsing, looping, output handling
\author Moritz Bunkus <moritz@bunkus.org>
*/
@ -506,7 +506,7 @@ static void render_headers(mm_io_c *out) {
*(static_cast<EbmlFloat *>(kax_duration)) = 0.0;
string version = string("libebml v") + EbmlCodeVersion +
string(" + libmatroska v") + KaxCodeVersion + string("äöü!!!");
string(" + libmatroska v") + KaxCodeVersion;
*((EbmlUnicodeString *)&GetChild<KaxMuxingApp>(*kax_infos)) =
cstr_to_UTFstring(version.c_str());
*((EbmlUnicodeString *)&GetChild<KaxWritingApp>(*kax_infos)) =

9
pr_generic.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: pr_generic.cpp,v 1.49 2003/06/07 12:26:08 mosu Exp $
\version \$Id: pr_generic.cpp,v 1.50 2003/06/07 14:30:10 mosu Exp $
\brief functions common for all readers/packetizers
\author Moritz Bunkus <moritz@bunkus.org>
*/
@ -239,10 +239,9 @@ void generic_packetizer_c::set_headers() {
*(static_cast<EbmlUInteger *>
(&GetChild<KaxTrackType>(*track_entry))) = htrack_type;
if (hcodec_id != NULL) {
KaxCodecID &codec_id = GetChild<KaxCodecID>(*track_entry);
codec_id.CopyBuffer((binary *)hcodec_id, strlen(hcodec_id) + 1);
}
if (hcodec_id != NULL)
*(static_cast<EbmlString *>
(&GetChild<KaxCodecID>(*track_entry))) = hcodec_id;
if (hcodec_private != NULL) {
KaxCodecPrivate &codec_private = GetChild<KaxCodecPrivate>(*track_entry);

8
r_matroska.cpp
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_matroska.cpp,v 1.44 2003/06/07 12:26:08 mosu Exp $
\version \$Id: r_matroska.cpp,v 1.45 2003/06/07 14:30:10 mosu Exp $
\brief Matroska reader
\author Moritz Bunkus <moritz@bunkus.org>
*/
@ -446,7 +446,7 @@ int mkv_reader_c::read_headers() {
upper_lvl_el = 0;
exit_loop = 0;
tc_scale = MKVD_TIMECODESCALE;
tc_scale = TIMECODE_SCALE;
// We've got our segment, so let's find the tracks
l1 = es->FindNextElement(l0->Generic().Context, upper_lvl_el, 0xFFFFFFFFL,
true, 1);
@ -705,8 +705,8 @@ int mkv_reader_c::read_headers() {
KaxCodecID &codec_id = *static_cast<KaxCodecID*>(l3);
codec_id.ReadData(es->I_O());
fprintf(stdout, "matroska_reader: | + Codec ID: %s\n",
&binary(codec_id));
track->codec_id = safestrdup((char *)&binary(codec_id));
string(codec_id).c_str());
track->codec_id = safestrdup(string(codec_id).c_str());
} else if (EbmlId(*l3) == KaxCodecPrivate::ClassInfos.GlobalId) {
KaxCodecPrivate &c_priv = *static_cast<KaxCodecPrivate*>(l3);

5
r_matroska.h
View File

@ -13,7 +13,7 @@
/*!
\file
\version \$Id: r_matroska.h,v 1.15 2003/05/23 06:34:57 mosu Exp $
\version \$Id: r_matroska.h,v 1.16 2003/06/07 14:30:10 mosu Exp $
\brief class definitions for the Matroska reader
\author Moritz Bunkus <moritz@bunkus.org>
*/
@ -34,9 +34,6 @@
using namespace LIBMATROSKA_NAMESPACE;
// default values for Matroska elements
#define MKVD_TIMECODESCALE 1000000 // 1000000 = 1ms
typedef struct {
uint32_t tnum, tuid;