don't use local include pathes to find libebml headers

(cherry picked from commit c3a7b89)
Matroska-Org · Oct 15, 2022 · 3cbad06 · 3cbad06
1 parent f6b7db5
commit 3cbad06
Show file tree

Hide file tree

Showing 24 changed files with 72 additions and 72 deletions.
diff --git a/matroska/FileKax.h b/matroska/FileKax.h
@@ -38,7 +38,7 @@
 //#include <vector>
 
 #include "matroska/KaxTypes.h"
-#include "ebml/IOCallback.h"
+#include <ebml/IOCallback.h>
 //#include "MainHeader.h"
 //#include "TrackType.h"
 //#include "StreamInfo.h"

diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h
@@ -38,8 +38,8 @@
 #include <vector>
 
 #include "matroska/KaxTypes.h"
-#include "ebml/EbmlBinary.h"
-#include "ebml/EbmlMaster.h"
+#include <ebml/EbmlBinary.h>
+#include <ebml/EbmlMaster.h>
 #include "matroska/KaxTracks.h"
 #include "matroska/KaxDefines.h"
 

diff --git 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 <ebml/EbmlMaster.h>
+#include <ebml/EbmlUInteger.h>
+#include <ebml/EbmlSInteger.h>
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxBlock.h"
 

diff --git 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 <ebml/EbmlMaster.h>
 #include "matroska/KaxTracks.h"
 #include "matroska/KaxBlock.h"
 #include "matroska/KaxCues.h"

diff --git 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 <ebml/EbmlElement.h>
 
 using namespace libebml;
 

diff --git a/matroska/KaxCues.h b/matroska/KaxCues.h
@@ -38,7 +38,7 @@
 #include <vector>
 
 #include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
+#include <ebml/EbmlMaster.h>
 #include "matroska/KaxBlock.h"
 
 using namespace libebml;

diff --git 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 <ebml/EbmlUInteger.h>
+#include <ebml/EbmlMaster.h>
 #include "matroska/KaxDefines.h"
 
 using namespace libebml;

diff --git 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 <ebml/EbmlVersion.h>
+#include <ebml/EbmlElement.h>
 
 #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
@@ -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 <ebml/EbmlUInteger.h>
+#include <ebml/EbmlFloat.h>
+#include <ebml/EbmlUnicodeString.h>
+#include <ebml/EbmlBinary.h>
+#include <ebml/EbmlDate.h>
+#include <ebml/EbmlMaster.h>
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 

diff --git 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 <ebml/EbmlMaster.h>
+#include <ebml/EbmlBinary.h>
+#include <ebml/EbmlUInteger.h>
 #include "matroska/KaxDefines.h"
 
 using namespace libebml;

diff --git 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 <ebml/EbmlMaster.h>
 #include "matroska/KaxDefines.h"
 
 using namespace libebml;

diff --git 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 <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 "matroska/KaxDefines.h"
 
 using namespace libebml;

diff --git 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 <ebml/EbmlMaster.h>
+#include <ebml/EbmlUInteger.h>
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 

diff --git 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 <ebml/EbmlTypes.h>
 #include "matroska/c/libmatroska_t.h"
 
 namespace libmatroska {

diff --git a/matroska/KaxVersion.h b/matroska/KaxVersion.h
@@ -35,7 +35,7 @@
 
 #include <string>
 
-#include "ebml/EbmlConfig.h"
+#include <ebml/EbmlConfig.h>
 #include "matroska/KaxConfig.h"
 
 namespace libmatroska {

diff --git 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 <ebml/EbmlVersion.h>
+#include <ebml/EbmlContexts.h>
 //#include "Cluster.h"
 //#include "Track.h"
 //#include "Block.h"

diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp
@@ -36,8 +36,8 @@
 
 //#include <streams.h>
 
-#include "ebml/MemReadIOCallback.h"
-#include "ebml/SafeReadIOCallback.h"
+#include <ebml/MemReadIOCallback.h>
+#include <ebml/SafeReadIOCallback.h>
 #include "matroska/KaxBlock.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxBlockData.h"

diff --git 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     <robux4 @ users.sf.net>
 */
-#include "ebml/EbmlContexts.h"
-#include "ebml/EbmlHead.h"
+#include <ebml/EbmlContexts.h>
+#include <ebml/EbmlHead.h>
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxBlock.h"
 #include "matroska/KaxCluster.h"

diff --git 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 <ebml/EbmlStream.h>
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 

diff --git a/src/KaxSegment.cpp b/src/KaxSegment.cpp
@@ -33,7 +33,7 @@
   \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "matroska/KaxSegment.h"
-#include "ebml/EbmlHead.h"
+#include <ebml/EbmlHead.h>
 
 // sub elements
 #include "matroska/KaxCluster.h"

diff --git a/test/ebml/test0.cpp b/test/ebml/test0.cpp
@@ -38,17 +38,17 @@
 
 #include <stdio.h>
 
-#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 <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>
 
 using namespace libebml;
 

diff --git a/test/ebml/test00.cpp b/test/ebml/test00.cpp
@@ -37,18 +37,18 @@
 #include <stdio.h>
 #include <string>
 
-#include "ebml/StdIOCallback.h"
+#include <ebml/StdIOCallback.h>
 
-#include "ebml/EbmlHead.h"
-#include "ebml/EbmlSubHead.h"
-#include "ebml/EbmlStream.h"
-#include "ebml/EbmlVoid.h"
-#include "ebml/EbmlContexts.h"
+#include <ebml/EbmlHead.h>
+#include <ebml/EbmlSubHead.h>
+#include <ebml/EbmlStream.h>
+#include <ebml/EbmlVoid.h>
+#include <ebml/EbmlContexts.h>
 #include "matroska/KaxSegment.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxSemantic.h"
 
-#include "ebml/EbmlVersion.h"
+#include <ebml/EbmlVersion.h>
 #include "matroska/KaxVersion.h"
 
 using namespace libmatroska;

diff --git a/test/mux/test6.cpp b/test/mux/test6.cpp
@@ -40,11 +40,11 @@
 
 #include <iostream>
 
-#include "ebml/StdIOCallback.h"
+#include <ebml/StdIOCallback.h>
 
-#include "ebml/EbmlHead.h"
-#include "ebml/EbmlSubHead.h"
-#include "ebml/EbmlVoid.h"
+#include <ebml/EbmlHead.h>
+#include <ebml/EbmlSubHead.h>
+#include <ebml/EbmlVoid.h>
 #include "matroska/FileKax.h"
 #include "matroska/KaxSegment.h"
 #include "matroska/KaxTracks.h"

diff --git a/test/mux/test8.cpp b/test/mux/test8.cpp
@@ -35,12 +35,12 @@
 #include <iostream>
 #include <cassert>
 
-#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 <ebml/EbmlHead.h>
+#include <ebml/EbmlSubHead.h>
+#include <ebml/EbmlStream.h>
+#include <ebml/EbmlContexts.h>
+#include <ebml/EbmlVoid.h>
+#include <ebml/EbmlCrc32.h>
 #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 <ebml/StdIOCallback.h>
 
 using namespace libmatroska;
 using namespace std;