From 3df07b41a98466e5db4fe429a8c7d4d0576e8e8f Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 30 Sep 2003 13:46:52 +0000 Subject: [PATCH] Fixes for compilation with gcc 2.95. --- src/mkvextract_attachments.cpp | 2 +- src/mkvextract_chapters.cpp | 2 +- src/mkvextract_tags.cpp | 2 +- src/r_real.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mkvextract_attachments.cpp b/src/mkvextract_attachments.cpp index ecacb5b7c..5401ca58c 100644 --- a/src/mkvextract_attachments.cpp +++ b/src/mkvextract_attachments.cpp @@ -207,7 +207,7 @@ void extract_attachments(const char *file_name) { } show_element(l0, 0, "Next level 0 element is not a segment but %s", - typeid(*l0).name()); + l0->Generic().DebugName); l0->SkipData(*es, l0->Generic().Context); delete l0; diff --git a/src/mkvextract_chapters.cpp b/src/mkvextract_chapters.cpp index 4d21d8171..62ca77c6f 100644 --- a/src/mkvextract_chapters.cpp +++ b/src/mkvextract_chapters.cpp @@ -120,7 +120,7 @@ void extract_chapters(const char *file_name, bool chapter_format_simple) { } show_element(l0, 0, "Next level 0 element is not a segment but %s", - typeid(*l0).name()); + l0->Generic().DebugName); l0->SkipData(*es, l0->Generic().Context); delete l0; diff --git a/src/mkvextract_tags.cpp b/src/mkvextract_tags.cpp index 2b37eb5ca..c46fc0157 100644 --- a/src/mkvextract_tags.cpp +++ b/src/mkvextract_tags.cpp @@ -120,7 +120,7 @@ void extract_tags(const char *file_name) { } show_element(l0, 0, "Next level 0 element is not a segment but %s", - typeid(*l0).name()); + l0->Generic().DebugName); l0->SkipData(*es, l0->Generic().Context); delete l0; diff --git a/src/r_real.cpp b/src/r_real.cpp index f45d6bfed..918001eaa 100644 --- a/src/r_real.cpp +++ b/src/r_real.cpp @@ -818,7 +818,7 @@ void real_reader_c::assemble_packet(real_demuxer_t *dmx, unsigned char *p, vpkg_offset = vpkg_length - vpkg_offset; } - len = min(bc.get_len(), vpkg_length - vpkg_offset); + len = min(bc.get_len(), (int)(vpkg_length - vpkg_offset)); segment.offset = vpkg_offset; segment.data = (unsigned char *)safemalloc(len); segment.size = len;