From: Steve Lhomme Date: Sat, 15 Oct 2022 08:41:59 +0000 (+0200) Subject: don't use local include pathes to find libebml headers X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3a7b89e9306ca50726bfc4a6399df2b888a3309;p=libmatroska don't use local include pathes to find libebml headers --- diff --git a/matroska/FileKax.h b/matroska/FileKax.h index b234720..c813f8d 100644 --- a/matroska/FileKax.h +++ b/matroska/FileKax.h @@ -38,7 +38,7 @@ //#include #include "matroska/KaxTypes.h" -#include "ebml/IOCallback.h" +#include //#include "MainHeader.h" //#include "TrackType.h" //#include "StreamInfo.h" diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h index 9e22829..d272bfd 100644 --- a/matroska/KaxBlock.h +++ b/matroska/KaxBlock.h @@ -38,8 +38,8 @@ #include #include "matroska/KaxTypes.h" -#include "ebml/EbmlBinary.h" -#include "ebml/EbmlMaster.h" +#include +#include #include "matroska/KaxTracks.h" #include "matroska/KaxDefines.h" diff --git a/matroska/KaxBlockData.h b/matroska/KaxBlockData.h index 534bd09..405aac3 100644 --- a/matroska/KaxBlockData.h +++ b/matroska/KaxBlockData.h @@ -34,9 +34,9 @@ #define LIBMATROSKA_BLOCK_ADDITIONAL_H #include "matroska/KaxTypes.h" -#include "ebml/EbmlMaster.h" -#include "ebml/EbmlUInteger.h" -#include "ebml/EbmlSInteger.h" +#include +#include +#include #include "matroska/KaxDefines.h" #include "matroska/KaxBlock.h" diff --git a/matroska/KaxCluster.h b/matroska/KaxCluster.h index eb89d88..aeb300e 100644 --- a/matroska/KaxCluster.h +++ b/matroska/KaxCluster.h @@ -36,7 +36,7 @@ #define LIBMATROSKA_CLUSTER_H #include "matroska/KaxTypes.h" -#include "ebml/EbmlMaster.h" +#include #include "matroska/KaxTracks.h" #include "matroska/KaxBlock.h" #include "matroska/KaxCues.h" diff --git a/matroska/KaxContexts.h b/matroska/KaxContexts.h index 37808bc..096eebb 100644 --- a/matroska/KaxContexts.h +++ b/matroska/KaxContexts.h @@ -36,7 +36,7 @@ #define LIBMATROSKA_CONTEXTS_H #include "matroska/KaxTypes.h" -#include "ebml/EbmlElement.h" +#include using namespace libebml; diff --git a/matroska/KaxCues.h b/matroska/KaxCues.h index 90c6dba..25ead53 100644 --- a/matroska/KaxCues.h +++ b/matroska/KaxCues.h @@ -38,7 +38,7 @@ #include #include "matroska/KaxTypes.h" -#include "ebml/EbmlMaster.h" +#include #include "matroska/KaxBlock.h" using namespace libebml; diff --git a/matroska/KaxCuesData.h b/matroska/KaxCuesData.h index 144d4db..38878d4 100644 --- a/matroska/KaxCuesData.h +++ b/matroska/KaxCuesData.h @@ -34,8 +34,8 @@ #define LIBMATROSKA_CUES_DATA_H #include "matroska/KaxTypes.h" -#include "ebml/EbmlUInteger.h" -#include "ebml/EbmlMaster.h" +#include +#include #include "matroska/KaxDefines.h" using namespace libebml; diff --git a/matroska/KaxDefines.h b/matroska/KaxDefines.h index 7734eb4..e6b866b 100644 --- a/matroska/KaxDefines.h +++ b/matroska/KaxDefines.h @@ -33,8 +33,8 @@ #ifndef LIBMATROSKA_DEFINES_H #define LIBMATROSKA_DEFINES_H -#include "ebml/EbmlVersion.h" -#include "ebml/EbmlElement.h" +#include +#include #if defined(HAVE_EBML2) || defined(HAS_EBML2) #define DEFINE_MKX_CONTEXT(a) DEFINE_xxx_CONTEXT(a,EBML_SemanticGlobal) diff --git a/matroska/KaxInfoData.h b/matroska/KaxInfoData.h index 9af7553..c23f060 100644 --- a/matroska/KaxInfoData.h +++ b/matroska/KaxInfoData.h @@ -38,12 +38,12 @@ #define LIBMATROSKA_INFO_DATA_H #include "matroska/KaxTypes.h" -#include "ebml/EbmlUInteger.h" -#include "ebml/EbmlFloat.h" -#include "ebml/EbmlUnicodeString.h" -#include "ebml/EbmlBinary.h" -#include "ebml/EbmlDate.h" -#include "ebml/EbmlMaster.h" +#include +#include +#include +#include +#include +#include #include "matroska/KaxDefines.h" #include "matroska/KaxSemantic.h" diff --git a/matroska/KaxSeekHead.h b/matroska/KaxSeekHead.h index f21fdcd..46aac7f 100644 --- a/matroska/KaxSeekHead.h +++ b/matroska/KaxSeekHead.h @@ -36,9 +36,9 @@ #define LIBMATROSKA_SEEK_HEAD_H #include "matroska/KaxTypes.h" -#include "ebml/EbmlMaster.h" -#include "ebml/EbmlBinary.h" -#include "ebml/EbmlUInteger.h" +#include +#include +#include #include "matroska/KaxDefines.h" using namespace libebml; diff --git a/matroska/KaxSegment.h b/matroska/KaxSegment.h index 112d61d..3384890 100644 --- a/matroska/KaxSegment.h +++ b/matroska/KaxSegment.h @@ -36,7 +36,7 @@ #define LIBMATROSKA_SEGMENT_H #include "matroska/KaxTypes.h" -#include "ebml/EbmlMaster.h" +#include #include "matroska/KaxDefines.h" using namespace libebml; diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h index fe55375..7c5fb85 100644 --- a/matroska/KaxSemantic.h +++ b/matroska/KaxSemantic.h @@ -34,14 +34,14 @@ #define LIBMATROSKA_SEMANTIC_H #include "matroska/KaxTypes.h" -#include "ebml/EbmlUInteger.h" -#include "ebml/EbmlSInteger.h" -#include "ebml/EbmlDate.h" -#include "ebml/EbmlFloat.h" -#include "ebml/EbmlString.h" -#include "ebml/EbmlUnicodeString.h" -#include "ebml/EbmlBinary.h" -#include "ebml/EbmlMaster.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "matroska/KaxDefines.h" using namespace libebml; diff --git a/matroska/KaxTracks.h b/matroska/KaxTracks.h index 1edb5a0..9b9ff39 100644 --- a/matroska/KaxTracks.h +++ b/matroska/KaxTracks.h @@ -36,8 +36,8 @@ #define LIBMATROSKA_TRACKS_H #include "matroska/KaxTypes.h" -#include "ebml/EbmlMaster.h" -#include "ebml/EbmlUInteger.h" +#include +#include #include "matroska/KaxDefines.h" #include "matroska/KaxSemantic.h" diff --git a/matroska/KaxTypes.h b/matroska/KaxTypes.h index 95c7185..6be0830 100644 --- a/matroska/KaxTypes.h +++ b/matroska/KaxTypes.h @@ -35,7 +35,7 @@ #define LIBMATROSKA_TYPES_H #include "matroska/KaxConfig.h" -#include "ebml/EbmlTypes.h" +#include #include "matroska/c/libmatroska_t.h" namespace libmatroska { diff --git a/matroska/KaxVersion.h b/matroska/KaxVersion.h index e6a7782..a75d494 100644 --- a/matroska/KaxVersion.h +++ b/matroska/KaxVersion.h @@ -35,7 +35,7 @@ #include -#include "ebml/EbmlConfig.h" +#include #include "matroska/KaxConfig.h" namespace libmatroska { diff --git a/src/FileKax.cpp b/src/FileKax.cpp index 338e1e1..3375366 100644 --- a/src/FileKax.cpp +++ b/src/FileKax.cpp @@ -34,8 +34,8 @@ */ //#include "StdInclude.h" #include "matroska/FileKax.h" -#include "ebml/EbmlVersion.h" -#include "ebml/EbmlContexts.h" +#include +#include //#include "Cluster.h" //#include "Track.h" //#include "Block.h" diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp index d0c915a..33f1829 100644 --- a/src/KaxBlock.cpp +++ b/src/KaxBlock.cpp @@ -36,8 +36,8 @@ //#include -#include "ebml/MemReadIOCallback.h" -#include "ebml/SafeReadIOCallback.h" +#include +#include #include "matroska/KaxBlock.h" #include "matroska/KaxContexts.h" #include "matroska/KaxBlockData.h" diff --git a/src/KaxContexts.cpp b/src/KaxContexts.cpp index fd92035..aece92c 100644 --- a/src/KaxContexts.cpp +++ b/src/KaxContexts.cpp @@ -32,8 +32,8 @@ \version \$Id: KaxContexts.cpp 640 2004-07-09 21:05:36Z mosu $ \author Steve Lhomme */ -#include "ebml/EbmlContexts.h" -#include "ebml/EbmlHead.h" +#include +#include #include "matroska/KaxContexts.h" #include "matroska/KaxBlock.h" #include "matroska/KaxCluster.h" diff --git a/src/KaxCues.cpp b/src/KaxCues.cpp index 5151e33..e58f61c 100644 --- a/src/KaxCues.cpp +++ b/src/KaxCues.cpp @@ -35,7 +35,7 @@ #include "matroska/KaxCues.h" #include "matroska/KaxCuesData.h" #include "matroska/KaxContexts.h" -#include "ebml/EbmlStream.h" +#include #include "matroska/KaxDefines.h" #include "matroska/KaxSemantic.h" diff --git a/src/KaxSegment.cpp b/src/KaxSegment.cpp index ddc0915..eb3e0c3 100644 --- a/src/KaxSegment.cpp +++ b/src/KaxSegment.cpp @@ -33,7 +33,7 @@ \author Steve Lhomme */ #include "matroska/KaxSegment.h" -#include "ebml/EbmlHead.h" +#include // sub elements #include "matroska/KaxCluster.h" diff --git a/test/ebml/test0.cpp b/test/ebml/test0.cpp index ac94fe7..7dd9d7a 100644 --- a/test/ebml/test0.cpp +++ b/test/ebml/test0.cpp @@ -38,17 +38,17 @@ #include -#include "ebml/StdIOCallback.h" - -#include "ebml/EbmlUInteger.h" -#include "ebml/EbmlSInteger.h" -#include "ebml/EbmlBinary.h" -#include "ebml/EbmlString.h" -#include "ebml/EbmlUnicodeString.h" -#include "ebml/EbmlMaster.h" -#include "ebml/EbmlFloat.h" -#include "ebml/EbmlStream.h" -#include "ebml/StdIOCallback.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace libebml; diff --git a/test/ebml/test00.cpp b/test/ebml/test00.cpp index 8609640..1f9ef40 100644 --- a/test/ebml/test00.cpp +++ b/test/ebml/test00.cpp @@ -37,18 +37,18 @@ #include #include -#include "ebml/StdIOCallback.h" +#include -#include "ebml/EbmlHead.h" -#include "ebml/EbmlSubHead.h" -#include "ebml/EbmlStream.h" -#include "ebml/EbmlVoid.h" -#include "ebml/EbmlContexts.h" +#include +#include +#include +#include +#include #include "matroska/KaxSegment.h" #include "matroska/KaxContexts.h" #include "matroska/KaxSemantic.h" -#include "ebml/EbmlVersion.h" +#include #include "matroska/KaxVersion.h" using namespace libmatroska; diff --git a/test/mux/test6.cpp b/test/mux/test6.cpp index 1076621..fcc7d5e 100644 --- a/test/mux/test6.cpp +++ b/test/mux/test6.cpp @@ -40,11 +40,11 @@ #include -#include "ebml/StdIOCallback.h" +#include -#include "ebml/EbmlHead.h" -#include "ebml/EbmlSubHead.h" -#include "ebml/EbmlVoid.h" +#include +#include +#include #include "matroska/FileKax.h" #include "matroska/KaxSegment.h" #include "matroska/KaxTracks.h" diff --git a/test/mux/test8.cpp b/test/mux/test8.cpp index 46c1f78..132619a 100644 --- a/test/mux/test8.cpp +++ b/test/mux/test8.cpp @@ -35,12 +35,12 @@ #include #include -#include "ebml/EbmlHead.h" -#include "ebml/EbmlSubHead.h" -#include "ebml/EbmlStream.h" -#include "ebml/EbmlContexts.h" -#include "ebml/EbmlVoid.h" -#include "ebml/EbmlCrc32.h" +#include +#include +#include +#include +#include +#include #include "matroska/FileKax.h" #include "matroska/KaxSegment.h" #include "matroska/KaxContexts.h" @@ -50,7 +50,7 @@ #include "matroska/KaxBlockData.h" #include "matroska/KaxSeekHead.h" #include "matroska/KaxCuesData.h" -#include "ebml/StdIOCallback.h" +#include using namespace libmatroska; using namespace std;