[vlc-commits] demux: adaptive: fix local include pathes
Steve Lhomme
git at videolan.org
Mon Jul 15 11:27:39 CEST 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul 15 11:23:50 2019 +0200| [e44fb5d54248dd6fa1b0587d13aadf3a68acfa08] | committer: Steve Lhomme
demux: adaptive: fix local include pathes
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e44fb5d54248dd6fa1b0587d13aadf3a68acfa08
---
modules/demux/adaptive/mp4/AtomsReader.hpp | 2 +-
modules/demux/adaptive/tools/FormatNamespace.cpp | 4 ++--
modules/demux/dash/mp4/IndexReader.hpp | 2 +-
modules/demux/dash/mpd/AdaptationSet.h | 2 +-
.../demux/dash/mpd/DASHCommonAttributesElements.cpp | 2 +-
modules/demux/dash/mpd/DASHSegment.cpp | 4 ++--
modules/demux/dash/mpd/DASHSegment.h | 4 ++--
modules/demux/dash/mpd/IsoffMainParser.cpp | 20 ++++++++++----------
modules/demux/dash/mpd/IsoffMainParser.h | 2 +-
modules/demux/dash/mpd/MPD.h | 4 ++--
modules/demux/dash/mpd/Period.h | 4 ++--
modules/demux/dash/mpd/Representation.cpp | 4 ++--
modules/demux/dash/mpd/Representation.h | 4 ++--
modules/demux/hls/HLSStreams.cpp | 4 ++--
modules/demux/hls/playlist/HLSSegment.cpp | 2 +-
modules/demux/hls/playlist/HLSSegment.hpp | 4 ++--
modules/demux/hls/playlist/M3U8.cpp | 4 ++--
modules/demux/hls/playlist/M3U8.hpp | 2 +-
modules/demux/hls/playlist/Parser.cpp | 16 ++++++++--------
modules/demux/hls/playlist/Parser.hpp | 2 +-
modules/demux/hls/playlist/Representation.cpp | 6 +++---
modules/demux/hls/playlist/Representation.hpp | 6 +++---
modules/demux/smooth/mp4/IndexReader.cpp | 10 +++++-----
modules/demux/smooth/mp4/IndexReader.hpp | 2 +-
modules/demux/smooth/playlist/ForgedInitSegment.cpp | 6 +++---
modules/demux/smooth/playlist/ForgedInitSegment.hpp | 4 ++--
modules/demux/smooth/playlist/Manifest.cpp | 2 +-
modules/demux/smooth/playlist/Manifest.hpp | 6 +++---
modules/demux/smooth/playlist/MemoryChunk.hpp | 2 +-
modules/demux/smooth/playlist/Parser.cpp | 16 ++++++++--------
modules/demux/smooth/playlist/Parser.hpp | 2 +-
modules/demux/smooth/playlist/Representation.cpp | 6 +++---
modules/demux/smooth/playlist/Representation.hpp | 4 ++--
modules/demux/smooth/playlist/SmoothSegment.cpp | 4 ++--
modules/demux/smooth/playlist/SmoothSegment.hpp | 4 ++--
35 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/modules/demux/adaptive/mp4/AtomsReader.hpp b/modules/demux/adaptive/mp4/AtomsReader.hpp
index 48fd86e995..6e4d31551a 100644
--- a/modules/demux/adaptive/mp4/AtomsReader.hpp
+++ b/modules/demux/adaptive/mp4/AtomsReader.hpp
@@ -23,7 +23,7 @@
#include <vlc_common.h>
#include <vlc_stream.h>
extern "C" {
-#include "../../demux/mp4/libmp4.h"
+#include "../../mp4/libmp4.h"
}
namespace adaptive
diff --git a/modules/demux/adaptive/tools/FormatNamespace.cpp b/modules/demux/adaptive/tools/FormatNamespace.cpp
index d23cad7721..c07fd06ad5 100644
--- a/modules/demux/adaptive/tools/FormatNamespace.cpp
+++ b/modules/demux/adaptive/tools/FormatNamespace.cpp
@@ -22,8 +22,8 @@
#endif
#include "FormatNamespace.hpp"
-#include "../../demux/mp4/mpeg4.h"
-#include "../../packetizer/mpeg4audio.h"
+#include "../../mp4/mpeg4.h"
+#include "../../../packetizer/mpeg4audio.h"
#include "../tools/Helper.h"
#include <list>
diff --git a/modules/demux/dash/mp4/IndexReader.hpp b/modules/demux/dash/mp4/IndexReader.hpp
index 7c19e87df7..b44a39f081 100644
--- a/modules/demux/dash/mp4/IndexReader.hpp
+++ b/modules/demux/dash/mp4/IndexReader.hpp
@@ -20,7 +20,7 @@
#ifndef INDEXREADER_HPP
#define INDEXREADER_HPP
-#include "../adaptive/mp4/AtomsReader.hpp"
+#include "../../adaptive/mp4/AtomsReader.hpp"
namespace adaptive
{
diff --git a/modules/demux/dash/mpd/AdaptationSet.h b/modules/demux/dash/mpd/AdaptationSet.h
index e48d6f1f0c..dbfa03bb2e 100644
--- a/modules/demux/dash/mpd/AdaptationSet.h
+++ b/modules/demux/dash/mpd/AdaptationSet.h
@@ -29,7 +29,7 @@
#include <string>
#include <map>
-#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../../adaptive/playlist/BaseAdaptationSet.h"
#include "DASHCommonAttributesElements.h"
namespace dash
diff --git a/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp b/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
index 62feae01bd..e7bad1e236 100644
--- a/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
+++ b/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
@@ -28,7 +28,7 @@
#include "DASHCommonAttributesElements.h"
#include "ContentDescription.h"
-#include "../adaptive/StreamFormat.hpp"
+#include "../../adaptive/StreamFormat.hpp"
#include <vlc_common.h>
#include <vlc_arrays.h>
diff --git a/modules/demux/dash/mpd/DASHSegment.cpp b/modules/demux/dash/mpd/DASHSegment.cpp
index 455cf9132d..95a23575c7 100644
--- a/modules/demux/dash/mpd/DASHSegment.cpp
+++ b/modules/demux/dash/mpd/DASHSegment.cpp
@@ -27,9 +27,9 @@
#endif
#include "DASHSegment.h"
-#include "../adaptive/playlist/BaseRepresentation.h"
+#include "../../adaptive/playlist/BaseRepresentation.h"
#include "../mp4/IndexReader.hpp"
-#include "../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/AbstractPlaylist.hpp"
using namespace adaptive::playlist;
using namespace dash::mpd;
diff --git a/modules/demux/dash/mpd/DASHSegment.h b/modules/demux/dash/mpd/DASHSegment.h
index 5aa21db9d3..6dca2c8d98 100644
--- a/modules/demux/dash/mpd/DASHSegment.h
+++ b/modules/demux/dash/mpd/DASHSegment.h
@@ -25,8 +25,8 @@
#ifndef DASHSEGMENT_H_
#define DASHSEGMENT_H_
-#include "../adaptive/playlist/Segment.h"
-#include "../adaptive/playlist/SegmentChunk.hpp"
+#include "../../adaptive/playlist/Segment.h"
+#include "../../adaptive/playlist/SegmentChunk.hpp"
namespace dash
{
diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp
index cb063c2db0..158e257ef3 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -27,22 +27,22 @@
#endif
#include "IsoffMainParser.h"
-#include "../adaptive/playlist/SegmentTemplate.h"
-#include "../adaptive/playlist/Segment.h"
-#include "../adaptive/playlist/SegmentBase.h"
-#include "../adaptive/playlist/SegmentList.h"
-#include "../adaptive/playlist/SegmentTimeline.h"
-#include "../adaptive/playlist/SegmentInformation.hpp"
+#include "../../adaptive/playlist/SegmentTemplate.h"
+#include "../../adaptive/playlist/Segment.h"
+#include "../../adaptive/playlist/SegmentBase.h"
+#include "../../adaptive/playlist/SegmentList.h"
+#include "../../adaptive/playlist/SegmentTimeline.h"
+#include "../../adaptive/playlist/SegmentInformation.hpp"
#include "MPD.h"
#include "Representation.h"
#include "Period.h"
#include "AdaptationSet.h"
#include "ProgramInformation.h"
#include "DASHSegment.h"
-#include "../adaptive/xml/DOMHelper.h"
-#include "../adaptive/tools/Helper.h"
-#include "../adaptive/tools/Debug.hpp"
-#include "../adaptive/tools/Conversions.hpp"
+#include "../../adaptive/xml/DOMHelper.h"
+#include "../../adaptive/tools/Helper.h"
+#include "../../adaptive/tools/Debug.hpp"
+#include "../../adaptive/tools/Conversions.hpp"
#include <vlc_stream.h>
#include <cstdio>
#include <limits>
diff --git a/modules/demux/dash/mpd/IsoffMainParser.h b/modules/demux/dash/mpd/IsoffMainParser.h
index c7ea367465..3ff61d36f8 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.h
+++ b/modules/demux/dash/mpd/IsoffMainParser.h
@@ -29,7 +29,7 @@
# include "config.h"
#endif
-#include "../adaptive/playlist/SegmentInfoCommon.h"
+#include "../../adaptive/playlist/SegmentInfoCommon.h"
#include "Profile.hpp"
#include <cstdlib>
diff --git a/modules/demux/dash/mpd/MPD.h b/modules/demux/dash/mpd/MPD.h
index 06d627e456..fb06f52188 100644
--- a/modules/demux/dash/mpd/MPD.h
+++ b/modules/demux/dash/mpd/MPD.h
@@ -25,8 +25,8 @@
#ifndef MPD_H_
#define MPD_H_
-#include "../adaptive/playlist/AbstractPlaylist.hpp"
-#include "../adaptive/StreamFormat.hpp"
+#include "../../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/StreamFormat.hpp"
#include "Profile.hpp"
namespace dash
diff --git a/modules/demux/dash/mpd/Period.h b/modules/demux/dash/mpd/Period.h
index 585cd2b4ce..25bf93d3ab 100644
--- a/modules/demux/dash/mpd/Period.h
+++ b/modules/demux/dash/mpd/Period.h
@@ -24,8 +24,8 @@
#ifndef PERIOD_H_
#define PERIOD_H_
-#include "../adaptive/playlist/BasePeriod.h"
-#include "../adaptive/playlist/SegmentInformation.hpp"
+#include "../../adaptive/playlist/BasePeriod.h"
+#include "../../adaptive/playlist/SegmentInformation.hpp"
namespace dash
{
diff --git a/modules/demux/dash/mpd/Representation.cpp b/modules/demux/dash/mpd/Representation.cpp
index 7bf2a39f0e..a1acf7986c 100644
--- a/modules/demux/dash/mpd/Representation.cpp
+++ b/modules/demux/dash/mpd/Representation.cpp
@@ -30,8 +30,8 @@
#include "Representation.h"
#include "AdaptationSet.h"
#include "MPD.h"
-#include "../adaptive/playlist/SegmentTemplate.h"
-#include "../adaptive/playlist/SegmentTimeline.h"
+#include "../../adaptive/playlist/SegmentTemplate.h"
+#include "../../adaptive/playlist/SegmentTimeline.h"
#include "TemplatedUri.hpp"
using namespace dash::mpd;
diff --git a/modules/demux/dash/mpd/Representation.h b/modules/demux/dash/mpd/Representation.h
index 19e71c5dac..ac0c5e1aa2 100644
--- a/modules/demux/dash/mpd/Representation.h
+++ b/modules/demux/dash/mpd/Representation.h
@@ -26,8 +26,8 @@
#define DASHREPRESENTATION_H_
#include "DASHCommonAttributesElements.h"
-#include "../adaptive/playlist/SegmentInfoCommon.h"
-#include "../adaptive/playlist/BaseRepresentation.h"
+#include "../../adaptive/playlist/SegmentInfoCommon.h"
+#include "../../adaptive/playlist/BaseRepresentation.h"
namespace dash
{
diff --git a/modules/demux/hls/HLSStreams.cpp b/modules/demux/hls/HLSStreams.cpp
index b96414516b..d5a48a0869 100644
--- a/modules/demux/hls/HLSStreams.cpp
+++ b/modules/demux/hls/HLSStreams.cpp
@@ -29,8 +29,8 @@
extern "C"
{
- #include "../meta_engine/ID3Tag.h"
- #include "../meta_engine/ID3Meta.h"
+ #include "../../meta_engine/ID3Tag.h"
+ #include "../../meta_engine/ID3Meta.h"
}
using namespace hls;
diff --git a/modules/demux/hls/playlist/HLSSegment.cpp b/modules/demux/hls/playlist/HLSSegment.cpp
index 6f7c13e7d1..83092d2cdb 100644
--- a/modules/demux/hls/playlist/HLSSegment.cpp
+++ b/modules/demux/hls/playlist/HLSSegment.cpp
@@ -22,7 +22,7 @@
#endif
#include "HLSSegment.hpp"
-#include "../adaptive/playlist/BaseRepresentation.h"
+#include "../../adaptive/playlist/BaseRepresentation.h"
using namespace hls::playlist;
diff --git a/modules/demux/hls/playlist/HLSSegment.hpp b/modules/demux/hls/playlist/HLSSegment.hpp
index e06f9e465b..90713a1288 100644
--- a/modules/demux/hls/playlist/HLSSegment.hpp
+++ b/modules/demux/hls/playlist/HLSSegment.hpp
@@ -20,8 +20,8 @@
#ifndef HLSSEGMENT_HPP
#define HLSSEGMENT_HPP
-#include "../adaptive/playlist/Segment.h"
-#include "../adaptive/encryption/CommonEncryption.hpp"
+#include "../../adaptive/playlist/Segment.h"
+#include "../../adaptive/encryption/CommonEncryption.hpp"
namespace hls
{
diff --git a/modules/demux/hls/playlist/M3U8.cpp b/modules/demux/hls/playlist/M3U8.cpp
index 39843a3e39..84d122b8de 100644
--- a/modules/demux/hls/playlist/M3U8.cpp
+++ b/modules/demux/hls/playlist/M3U8.cpp
@@ -23,8 +23,8 @@
#include "M3U8.hpp"
#include "Representation.hpp"
-#include "../adaptive/playlist/BasePeriod.h"
-#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../../adaptive/playlist/BasePeriod.h"
+#include "../../adaptive/playlist/BaseAdaptationSet.h"
using namespace hls::playlist;
diff --git a/modules/demux/hls/playlist/M3U8.hpp b/modules/demux/hls/playlist/M3U8.hpp
index 823f2b2da1..4021e5a3cf 100644
--- a/modules/demux/hls/playlist/M3U8.hpp
+++ b/modules/demux/hls/playlist/M3U8.hpp
@@ -21,7 +21,7 @@
#ifndef M3U8_H_
#define M3U8_H_
-#include "../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/AbstractPlaylist.hpp"
namespace hls
{
diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp
index dc467aae23..fddcc9931a 100644
--- a/modules/demux/hls/playlist/Parser.cpp
+++ b/modules/demux/hls/playlist/Parser.cpp
@@ -24,14 +24,14 @@
#include "Parser.hpp"
#include "HLSSegment.hpp"
#include "Representation.hpp"
-#include "../adaptive/SharedResources.hpp"
-#include "../adaptive/playlist/BasePeriod.h"
-#include "../adaptive/playlist/BaseAdaptationSet.h"
-#include "../adaptive/playlist/SegmentList.h"
-#include "../adaptive/encryption/Keyring.hpp"
-#include "../adaptive/tools/Retrieve.hpp"
-#include "../adaptive/tools/Helper.h"
-#include "../adaptive/tools/Conversions.hpp"
+#include "../../adaptive/SharedResources.hpp"
+#include "../../adaptive/playlist/BasePeriod.h"
+#include "../../adaptive/playlist/BaseAdaptationSet.h"
+#include "../../adaptive/playlist/SegmentList.h"
+#include "../../adaptive/encryption/Keyring.hpp"
+#include "../../adaptive/tools/Retrieve.hpp"
+#include "../../adaptive/tools/Helper.h"
+#include "../../adaptive/tools/Conversions.hpp"
#include "M3U8.hpp"
#include "Tags.hpp"
diff --git a/modules/demux/hls/playlist/Parser.hpp b/modules/demux/hls/playlist/Parser.hpp
index 5b98704a0c..fc0ac6314f 100644
--- a/modules/demux/hls/playlist/Parser.hpp
+++ b/modules/demux/hls/playlist/Parser.hpp
@@ -20,7 +20,7 @@
#ifndef PARSER_HPP
#define PARSER_HPP
-#include "../adaptive/playlist/SegmentInfoCommon.h"
+#include "../../adaptive/playlist/SegmentInfoCommon.h"
#include <cstdlib>
#include <sstream>
diff --git a/modules/demux/hls/playlist/Representation.cpp b/modules/demux/hls/playlist/Representation.cpp
index ddb6a7ad7f..6be82ac9e8 100644
--- a/modules/demux/hls/playlist/Representation.cpp
+++ b/modules/demux/hls/playlist/Representation.cpp
@@ -28,9 +28,9 @@
#include "M3U8.hpp"
#include "Parser.hpp"
#include "HLSSegment.hpp"
-#include "../adaptive/playlist/BasePeriod.h"
-#include "../adaptive/playlist/BaseAdaptationSet.h"
-#include "../adaptive/playlist/SegmentList.h"
+#include "../../adaptive/playlist/BasePeriod.h"
+#include "../../adaptive/playlist/BaseAdaptationSet.h"
+#include "../../adaptive/playlist/SegmentList.h"
#include <ctime>
diff --git a/modules/demux/hls/playlist/Representation.hpp b/modules/demux/hls/playlist/Representation.hpp
index 7f59cf9bf8..444b2a1481 100644
--- a/modules/demux/hls/playlist/Representation.hpp
+++ b/modules/demux/hls/playlist/Representation.hpp
@@ -21,9 +21,9 @@
#ifndef HLSREPRESENTATION_H_
#define HLSREPRESENTATION_H_
-#include "../adaptive/playlist/BaseRepresentation.h"
-#include "../adaptive/tools/Properties.hpp"
-#include "../adaptive/StreamFormat.hpp"
+#include "../../adaptive/playlist/BaseRepresentation.h"
+#include "../../adaptive/tools/Properties.hpp"
+#include "../../adaptive/StreamFormat.hpp"
namespace hls
{
diff --git a/modules/demux/smooth/mp4/IndexReader.cpp b/modules/demux/smooth/mp4/IndexReader.cpp
index f8c6d7b511..60ac7c0825 100644
--- a/modules/demux/smooth/mp4/IndexReader.cpp
+++ b/modules/demux/smooth/mp4/IndexReader.cpp
@@ -22,11 +22,11 @@
#endif
#include "IndexReader.hpp"
-#include "../adaptive/playlist/BaseRepresentation.h"
-#include "../adaptive/playlist/BaseAdaptationSet.h"
-#include "../adaptive/playlist/SegmentTemplate.h"
-#include "../adaptive/playlist/SegmentTimeline.h"
-#include "../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/BaseRepresentation.h"
+#include "../../adaptive/playlist/BaseAdaptationSet.h"
+#include "../../adaptive/playlist/SegmentTemplate.h"
+#include "../../adaptive/playlist/SegmentTimeline.h"
+#include "../../adaptive/playlist/AbstractPlaylist.hpp"
using namespace adaptive::mp4;
using namespace smooth::mp4;
diff --git a/modules/demux/smooth/mp4/IndexReader.hpp b/modules/demux/smooth/mp4/IndexReader.hpp
index c270ddc9a5..a8599a6529 100644
--- a/modules/demux/smooth/mp4/IndexReader.hpp
+++ b/modules/demux/smooth/mp4/IndexReader.hpp
@@ -20,7 +20,7 @@
#ifndef SMOOTHINDEXREADER_HPP
#define SMOOTHINDEXREADER_HPP
-#include "../adaptive/mp4/AtomsReader.hpp"
+#include "../../adaptive/mp4/AtomsReader.hpp"
namespace adaptive
{
diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.cpp b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
index 4a7c2d3857..c254312b8b 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.cpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
@@ -23,7 +23,7 @@
#include "ForgedInitSegment.hpp"
#include "MemoryChunk.hpp"
-#include "../adaptive/playlist/SegmentChunk.hpp"
+#include "../../adaptive/playlist/SegmentChunk.hpp"
#include <vlc_common.h>
@@ -31,8 +31,8 @@
extern "C"
{
- #include "../../mux/mp4/libmp4mux.h"
- #include "../../demux/mp4/libmp4.h" /* majors */
+ #include "../../../mux/mp4/libmp4mux.h"
+ #include "../../mp4/libmp4.h" /* majors */
}
using namespace adaptive;
diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.hpp b/modules/demux/smooth/playlist/ForgedInitSegment.hpp
index 4f0b1aaf03..f1aa361450 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.hpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.hpp
@@ -20,8 +20,8 @@
#ifndef FORGEDINITSEGMENT_HPP
#define FORGEDINITSEGMENT_HPP
-#include "../adaptive/playlist/Segment.h"
-#include "../adaptive/playlist/Inheritables.hpp"
+#include "../../adaptive/playlist/Segment.h"
+#include "../../adaptive/playlist/Inheritables.hpp"
#include <vlc_es.h>
#include <vlc_codecs.h>
diff --git a/modules/demux/smooth/playlist/Manifest.cpp b/modules/demux/smooth/playlist/Manifest.cpp
index 943765f5df..5538bc644f 100644
--- a/modules/demux/smooth/playlist/Manifest.cpp
+++ b/modules/demux/smooth/playlist/Manifest.cpp
@@ -22,7 +22,7 @@
#endif
#include "Manifest.hpp"
-#include "../adaptive/playlist/BasePeriod.h"
+#include "../../adaptive/playlist/BasePeriod.h"
#include <vlc_common.h>
diff --git a/modules/demux/smooth/playlist/Manifest.hpp b/modules/demux/smooth/playlist/Manifest.hpp
index 5e499c5325..94facfd503 100644
--- a/modules/demux/smooth/playlist/Manifest.hpp
+++ b/modules/demux/smooth/playlist/Manifest.hpp
@@ -20,9 +20,9 @@
#ifndef MANIFEST_HPP
#define MANIFEST_HPP
-#include "../adaptive/playlist/AbstractPlaylist.hpp"
-#include "../adaptive/playlist/Inheritables.hpp"
-#include "../adaptive/Time.hpp"
+#include "../../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/Inheritables.hpp"
+#include "../../adaptive/Time.hpp"
namespace smooth
{
diff --git a/modules/demux/smooth/playlist/MemoryChunk.hpp b/modules/demux/smooth/playlist/MemoryChunk.hpp
index 0bfc9206ba..fd91745750 100644
--- a/modules/demux/smooth/playlist/MemoryChunk.hpp
+++ b/modules/demux/smooth/playlist/MemoryChunk.hpp
@@ -20,7 +20,7 @@
#ifndef MEMORYCHUNK_HPP
#define MEMORYCHUNK_HPP
-#include "../adaptive/http/Chunk.h"
+#include "../../adaptive/http/Chunk.h"
namespace smooth
{
diff --git a/modules/demux/smooth/playlist/Parser.cpp b/modules/demux/smooth/playlist/Parser.cpp
index 188c0bef9b..9d2286bcfb 100644
--- a/modules/demux/smooth/playlist/Parser.cpp
+++ b/modules/demux/smooth/playlist/Parser.cpp
@@ -27,14 +27,14 @@
#include "Representation.hpp"
#include "ForgedInitSegment.hpp"
#include "SmoothSegment.hpp"
-#include "../adaptive/playlist/BasePeriod.h"
-#include "../adaptive/playlist/BaseAdaptationSet.h"
-#include "../adaptive/playlist/SegmentTimeline.h"
-#include "../adaptive/playlist/SegmentList.h"
-#include "../adaptive/xml/DOMHelper.h"
-#include "../adaptive/xml/Node.h"
-#include "../adaptive/tools/Helper.h"
-#include "../adaptive/tools/Conversions.hpp"
+#include "../../adaptive/playlist/BasePeriod.h"
+#include "../../adaptive/playlist/BaseAdaptationSet.h"
+#include "../../adaptive/playlist/SegmentTimeline.h"
+#include "../../adaptive/playlist/SegmentList.h"
+#include "../../adaptive/xml/DOMHelper.h"
+#include "../../adaptive/xml/Node.h"
+#include "../../adaptive/tools/Helper.h"
+#include "../../adaptive/tools/Conversions.hpp"
using namespace smooth::playlist;
using namespace adaptive::xml;
diff --git a/modules/demux/smooth/playlist/Parser.hpp b/modules/demux/smooth/playlist/Parser.hpp
index 5c59f7948d..70ee526283 100644
--- a/modules/demux/smooth/playlist/Parser.hpp
+++ b/modules/demux/smooth/playlist/Parser.hpp
@@ -20,7 +20,7 @@
#ifndef MANIFESTPARSER_HPP
#define MANIFESTPARSER_HPP
-#include "../adaptive/playlist/SegmentInfoCommon.h"
+#include "../../adaptive/playlist/SegmentInfoCommon.h"
#include <cstdlib>
#include <sstream>
diff --git a/modules/demux/smooth/playlist/Representation.cpp b/modules/demux/smooth/playlist/Representation.cpp
index 9021de5c5c..d919ade29e 100644
--- a/modules/demux/smooth/playlist/Representation.cpp
+++ b/modules/demux/smooth/playlist/Representation.cpp
@@ -23,9 +23,9 @@
#include "Representation.hpp"
#include "Manifest.hpp"
-#include "../adaptive/playlist/SegmentTemplate.h"
-#include "../adaptive/playlist/SegmentTimeline.h"
-#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../../adaptive/playlist/SegmentTemplate.h"
+#include "../../adaptive/playlist/SegmentTimeline.h"
+#include "../../adaptive/playlist/BaseAdaptationSet.h"
using namespace smooth::playlist;
diff --git a/modules/demux/smooth/playlist/Representation.hpp b/modules/demux/smooth/playlist/Representation.hpp
index fb4087aecb..2100fe2505 100644
--- a/modules/demux/smooth/playlist/Representation.hpp
+++ b/modules/demux/smooth/playlist/Representation.hpp
@@ -20,8 +20,8 @@
#ifndef SMOOTHREPRESENTATION_HPP
#define SMOOTHREPRESENTATION_HPP
-#include "../adaptive/playlist/SegmentInfoCommon.h"
-#include "../adaptive/playlist/BaseRepresentation.h"
+#include "../../adaptive/playlist/SegmentInfoCommon.h"
+#include "../../adaptive/playlist/BaseRepresentation.h"
namespace adaptive
{
diff --git a/modules/demux/smooth/playlist/SmoothSegment.cpp b/modules/demux/smooth/playlist/SmoothSegment.cpp
index 0b317e1b43..fc4eb7ac56 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.cpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.cpp
@@ -23,8 +23,8 @@
#include "SmoothSegment.hpp"
-#include "../adaptive/playlist/BaseRepresentation.h"
-#include "../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/BaseRepresentation.h"
+#include "../../adaptive/playlist/AbstractPlaylist.hpp"
#include "../mp4/IndexReader.hpp"
using namespace smooth::playlist;
diff --git a/modules/demux/smooth/playlist/SmoothSegment.hpp b/modules/demux/smooth/playlist/SmoothSegment.hpp
index 8fb9f91cdc..3849e38034 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.hpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.hpp
@@ -20,8 +20,8 @@
#ifndef SMOOTHSEGMENT_HPP
#define SMOOTHSEGMENT_HPP
-#include "../adaptive/playlist/SegmentTemplate.h"
-#include "../adaptive/playlist/SegmentChunk.hpp"
+#include "../../adaptive/playlist/SegmentTemplate.h"
+#include "../../adaptive/playlist/SegmentChunk.hpp"
namespace smooth
{
More information about the vlc-commits
mailing list