webm_dash_manifest: Update includes.
- Update includes for current libwebm layout.
- Fix forward declaration of mkvparser::Colour.
Change-Id: I69e1f60ef72465499499dfd1b3646838bc4841bc
diff --git a/shared/webm_file.cc b/shared/webm_file.cc
index 70b2a58..a2428cb 100644
--- a/shared/webm_file.cc
+++ b/shared/webm_file.cc
@@ -21,8 +21,9 @@
#include <utility>
#include <vector>
-#include "mkvparser.hpp"
-#include "mkvreader.hpp"
+#include "mkvparser/mkvparser.h"
+#include "mkvparser/mkvreader.h"
+
#include "webm_constants.h"
#include "webm_incremental_reader.h"
diff --git a/shared/webm_file.h b/shared/webm_file.h
index 07b64f1..b8b407c 100644
--- a/shared/webm_file.h
+++ b/shared/webm_file.h
@@ -22,7 +22,6 @@
class AudioTrack;
class Block;
class Cluster;
-class Colour;
class CuePoint;
class Cues;
class IMkvReader;
@@ -31,6 +30,8 @@
class SegmentInfo;
class Track;
class VideoTrack;
+
+struct Colour;
} // namespace mkvparser
namespace webm_tools {
diff --git a/shared/webm_incremental_reader.cc b/shared/webm_incremental_reader.cc
index f6c1b12..855f154 100644
--- a/shared/webm_incremental_reader.cc
+++ b/shared/webm_incremental_reader.cc
@@ -13,8 +13,8 @@
#include <cstdio>
#include <cstring>
-#include "mkvparser.hpp"
-#include "mkvreader.hpp"
+#include "mkvparser/mkvparser.h"
+#include "mkvparser/mkvreader.h"
namespace webm_tools {
diff --git a/shared/webm_incremental_reader.h b/shared/webm_incremental_reader.h
index 11258cb..ef1b63c 100644
--- a/shared/webm_incremental_reader.h
+++ b/shared/webm_incremental_reader.h
@@ -11,7 +11,8 @@
#ifndef SHARED_WEBM_INCREMENTAL_READER_H_
#define SHARED_WEBM_INCREMENTAL_READER_H_
-#include "mkvreader.hpp"
+#include "mkvparser/mkvreader.h"
+
#include "webm_tools_types.h"
namespace webm_tools {
diff --git a/webm_dash_manifest/representation.cc b/webm_dash_manifest/representation.cc
index 3332240..3888c1f 100644
--- a/webm_dash_manifest/representation.cc
+++ b/webm_dash_manifest/representation.cc
@@ -10,9 +10,10 @@
#include "representation.h"
+#include "mkvparser/mkvreader.h"
+
#include "dash_model.h"
#include "indent.h"
-#include "mkvreader.hpp"
#include "webm_constants.h"
#include "webm_file.h"
