[vlc-commits] dash: Fixing NullManager interface implementation.
Hugo Beauzée-Luyssen
git at videolan.org
Tue Jan 24 23:21:50 CET 2012
vlc/vlc-1.2 | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Thu Dec 1 16:55:38 2011 +0100| [51ddaa77d3d6384147fe8c04ca4d4ca615fe9a09] | committer: Jean-Baptiste Kempf
dash: Fixing NullManager interface implementation.
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 0a120d112e18f5cde5d57395dd36d18371365ccc)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=51ddaa77d3d6384147fe8c04ca4d4ca615fe9a09
---
modules/stream_filter/dash/mpd/NullManager.cpp | 4 ++++
modules/stream_filter/dash/mpd/NullManager.h | 3 ++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/modules/stream_filter/dash/mpd/NullManager.cpp b/modules/stream_filter/dash/mpd/NullManager.cpp
index 2d7d83c..044297c 100644
--- a/modules/stream_filter/dash/mpd/NullManager.cpp
+++ b/modules/stream_filter/dash/mpd/NullManager.cpp
@@ -53,3 +53,7 @@ Representation* NullManager::getRepresentation (Period *, long )
{
return NULL;
}
+const MPD* NullManager::getMPD() const
+{
+ return NULL;
+}
diff --git a/modules/stream_filter/dash/mpd/NullManager.h b/modules/stream_filter/dash/mpd/NullManager.h
index 683bd2e..14a6d48 100644
--- a/modules/stream_filter/dash/mpd/NullManager.h
+++ b/modules/stream_filter/dash/mpd/NullManager.h
@@ -27,6 +27,7 @@
#include "mpd/IMPDManager.h"
+#include "mpd/MPD.h"
#include "mpd/Period.h"
#include "mpd/Representation.h"
#include "mpd/ISegment.h"
@@ -45,7 +46,7 @@ namespace dash
Representation* getBestRepresentation (Period *period);
std::vector<ISegment *> getSegments (Representation *rep);
Representation* getRepresentation (Period *period, long bitrate);
-
+ const MPD* getMPD () const;
private:
std::vector<Period *> periods;
std::vector<ISegment *> segments;
More information about the vlc-commits
mailing list