diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index b66483fc10d88149f355a94a8f83693b04b89c9a..9b780492933c2f2d1c85342beaa610418c839203 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -236,3 +236,107 @@ endif
if HAVE_DVBPSI
demux_LTLIBRARIES += libts_plugin.la
endif
+
+libdash_plugin_la_SOURCES = \
+ demux/dash/adaptationlogic/AbstractAdaptationLogic.cpp \
+ demux/dash/adaptationlogic/AbstractAdaptationLogic.h \
+ demux/dash/adaptationlogic/AdaptationLogicFactory.cpp \
+ demux/dash/adaptationlogic/AdaptationLogicFactory.h \
+ demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp \
+ demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.h \
+ demux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp \
+ demux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp \
+ demux/dash/adaptationlogic/IAdaptationLogic.h \
+ demux/dash/adaptationlogic/IDownloadRateObserver.h \
+ demux/dash/adaptationlogic/RateBasedAdaptationLogic.h \
+ demux/dash/adaptationlogic/RateBasedAdaptationLogic.cpp \
+ demux/dash/adaptationlogic/Representationselectors.hpp \
+ demux/dash/adaptationlogic/Representationselectors.cpp \
+ demux/dash/buffer/BlockBuffer.cpp \
+ demux/dash/buffer/BlockBuffer.h \
+ demux/dash/buffer/IBufferObserver.h \
+ demux/dash/http/Chunk.cpp \
+ demux/dash/http/Chunk.h \
+ demux/dash/http/HTTPConnection.cpp \
+ demux/dash/http/HTTPConnection.h \
+ demux/dash/http/HTTPConnectionManager.cpp \
+ demux/dash/http/HTTPConnectionManager.h \
+ demux/dash/http/IHTTPConnection.cpp \
+ demux/dash/http/IHTTPConnection.h \
+ demux/dash/http/PersistentConnection.cpp \
+ demux/dash/http/PersistentConnection.h \
+ demux/dash/mpd/AdaptationSet.cpp \
+ demux/dash/mpd/AdaptationSet.h \
+ demux/dash/mpd/BaseUrl.h \
+ demux/dash/mpd/CommonAttributesElements.cpp \
+ demux/dash/mpd/CommonAttributesElements.h \
+ demux/dash/mpd/ContentDescription.cpp \
+ demux/dash/mpd/ContentDescription.h \
+ demux/dash/mpd/ICanonicalUrl.hpp \
+ demux/dash/mpd/IMPDParser.cpp \
+ demux/dash/mpd/IMPDParser.h \
+ demux/dash/mpd/IsoffMainParser.cpp \
+ demux/dash/mpd/IsoffMainParser.h \
+ demux/dash/mpd/MPD.cpp \
+ demux/dash/mpd/MPD.h \
+ demux/dash/mpd/MPDFactory.cpp \
+ demux/dash/mpd/MPDFactory.h \
+ demux/dash/mpd/Period.cpp \
+ demux/dash/mpd/Period.h \
+ demux/dash/mpd/Profile.cpp \
+ demux/dash/mpd/Profile.hpp \
+ demux/dash/mpd/ProgramInformation.cpp \
+ demux/dash/mpd/ProgramInformation.h \
+ demux/dash/mpd/Representation.cpp \
+ demux/dash/mpd/Representation.h \
+ demux/dash/mpd/Segment.cpp \
+ demux/dash/mpd/Segment.h \
+ demux/dash/mpd/SegmentBase.cpp \
+ demux/dash/mpd/SegmentBase.h \
+ demux/dash/mpd/SegmentInfo.cpp \
+ demux/dash/mpd/SegmentInfo.h \
+ demux/dash/mpd/SegmentInfoCommon.cpp \
+ demux/dash/mpd/SegmentInfoCommon.h \
+ demux/dash/mpd/SegmentInfoDefault.cpp \
+ demux/dash/mpd/SegmentInfoDefault.h \
+ demux/dash/mpd/SegmentInformation.cpp \
+ demux/dash/mpd/SegmentInformation.hpp \
+ demux/dash/mpd/SegmentList.cpp \
+ demux/dash/mpd/SegmentList.h \
+ demux/dash/mpd/SegmentTemplate.cpp \
+ demux/dash/mpd/SegmentTemplate.h \
+ demux/dash/mpd/SegmentTimeline.cpp \
+ demux/dash/mpd/SegmentTimeline.h \
+ demux/dash/mpd/TrickModeType.cpp \
+ demux/dash/mpd/TrickModeType.h \
+ demux/dash/mpd/Url.cpp \
+ demux/dash/mpd/Url.hpp \
+ demux/dash/mp4/AtomsReader.cpp \
+ demux/dash/mp4/AtomsReader.hpp \
+ demux/dash/xml/DOMHelper.cpp \
+ demux/dash/xml/DOMHelper.h \
+ demux/dash/xml/DOMParser.cpp \
+ demux/dash/xml/DOMParser.h \
+ demux/dash/xml/Node.cpp \
+ demux/dash/xml/Node.h \
+ demux/dash/dash.cpp \
+ demux/dash/dash.hpp \
+ demux/dash/DASHManager.cpp \
+ demux/dash/DASHManager.h \
+ demux/dash/Helper.cpp \
+ demux/dash/Helper.h \
+ demux/dash/Properties.hpp \
+ demux/dash/StreamsType.hpp \
+ demux/dash/Streams.cpp \
+ demux/dash/Streams.hpp
+
+libdash_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h
+
+libdash_plugin_la_CXXFLAGS = $(AM_CFLAGS) -I$(srcdir)/demux/dash
+libdash_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
+if HAVE_ZLIB
+libdash_plugin_la_LIBADD += -lz
+endif
+demux_LTLIBRARIES += libdash_plugin.la
+
+
diff --git a/modules/stream_filter/dash/DASHManager.cpp b/modules/demux/dash/DASHManager.cpp
similarity index 100%
rename from modules/stream_filter/dash/DASHManager.cpp
rename to modules/demux/dash/DASHManager.cpp
diff --git a/modules/stream_filter/dash/DASHManager.h b/modules/demux/dash/DASHManager.h
similarity index 100%
rename from modules/stream_filter/dash/DASHManager.h
rename to modules/demux/dash/DASHManager.h
diff --git a/modules/stream_filter/dash/Helper.cpp b/modules/demux/dash/Helper.cpp
similarity index 100%
rename from modules/stream_filter/dash/Helper.cpp
rename to modules/demux/dash/Helper.cpp
diff --git a/modules/stream_filter/dash/Helper.h b/modules/demux/dash/Helper.h
similarity index 100%
rename from modules/stream_filter/dash/Helper.h
rename to modules/demux/dash/Helper.h
diff --git a/modules/stream_filter/dash/Properties.hpp b/modules/demux/dash/Properties.hpp
similarity index 100%
rename from modules/stream_filter/dash/Properties.hpp
rename to modules/demux/dash/Properties.hpp
diff --git a/modules/stream_filter/dash/Streams.cpp b/modules/demux/dash/Streams.cpp
similarity index 100%
rename from modules/stream_filter/dash/Streams.cpp
rename to modules/demux/dash/Streams.cpp
diff --git a/modules/stream_filter/dash/Streams.hpp b/modules/demux/dash/Streams.hpp
similarity index 100%
rename from modules/stream_filter/dash/Streams.hpp
rename to modules/demux/dash/Streams.hpp
diff --git a/modules/stream_filter/dash/StreamsType.hpp b/modules/demux/dash/StreamsType.hpp
similarity index 100%
rename from modules/stream_filter/dash/StreamsType.hpp
rename to modules/demux/dash/StreamsType.hpp
diff --git a/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp b/modules/demux/dash/adaptationlogic/AbstractAdaptationLogic.cpp
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp
rename to modules/demux/dash/adaptationlogic/AbstractAdaptationLogic.cpp
diff --git a/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h b/modules/demux/dash/adaptationlogic/AbstractAdaptationLogic.h
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h
rename to modules/demux/dash/adaptationlogic/AbstractAdaptationLogic.h
diff --git a/modules/stream_filter/dash/adaptationlogic/AdaptationLogicFactory.cpp b/modules/demux/dash/adaptationlogic/AdaptationLogicFactory.cpp
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/AdaptationLogicFactory.cpp
rename to modules/demux/dash/adaptationlogic/AdaptationLogicFactory.cpp
diff --git a/modules/stream_filter/dash/adaptationlogic/AdaptationLogicFactory.h b/modules/demux/dash/adaptationlogic/AdaptationLogicFactory.h
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/AdaptationLogicFactory.h
rename to modules/demux/dash/adaptationlogic/AdaptationLogicFactory.h
diff --git a/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp b/modules/demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
rename to modules/demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
diff --git a/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h b/modules/demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
rename to modules/demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
diff --git a/modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp b/modules/demux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
rename to modules/demux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
diff --git a/modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp b/modules/demux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp
rename to modules/demux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp
diff --git a/modules/stream_filter/dash/adaptationlogic/IAdaptationLogic.h b/modules/demux/dash/adaptationlogic/IAdaptationLogic.h
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/IAdaptationLogic.h
rename to modules/demux/dash/adaptationlogic/IAdaptationLogic.h
diff --git a/modules/stream_filter/dash/adaptationlogic/IDownloadRateObserver.h b/modules/demux/dash/adaptationlogic/IDownloadRateObserver.h
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/IDownloadRateObserver.h
rename to modules/demux/dash/adaptationlogic/IDownloadRateObserver.h
diff --git a/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp b/modules/demux/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
rename to modules/demux/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
diff --git a/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h b/modules/demux/dash/adaptationlogic/RateBasedAdaptationLogic.h
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h
rename to modules/demux/dash/adaptationlogic/RateBasedAdaptationLogic.h
diff --git a/modules/stream_filter/dash/adaptationlogic/Representationselectors.cpp b/modules/demux/dash/adaptationlogic/Representationselectors.cpp
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/Representationselectors.cpp
rename to modules/demux/dash/adaptationlogic/Representationselectors.cpp
diff --git a/modules/stream_filter/dash/adaptationlogic/Representationselectors.hpp b/modules/demux/dash/adaptationlogic/Representationselectors.hpp
similarity index 100%
rename from modules/stream_filter/dash/adaptationlogic/Representationselectors.hpp
rename to modules/demux/dash/adaptationlogic/Representationselectors.hpp
diff --git a/modules/stream_filter/dash/buffer/BlockBuffer.cpp b/modules/demux/dash/buffer/BlockBuffer.cpp
similarity index 100%
rename from modules/stream_filter/dash/buffer/BlockBuffer.cpp
rename to modules/demux/dash/buffer/BlockBuffer.cpp
diff --git a/modules/stream_filter/dash/buffer/BlockBuffer.h b/modules/demux/dash/buffer/BlockBuffer.h
similarity index 100%
rename from modules/stream_filter/dash/buffer/BlockBuffer.h
rename to modules/demux/dash/buffer/BlockBuffer.h
diff --git a/modules/stream_filter/dash/buffer/IBufferObserver.h b/modules/demux/dash/buffer/IBufferObserver.h
similarity index 100%
rename from modules/stream_filter/dash/buffer/IBufferObserver.h
rename to modules/demux/dash/buffer/IBufferObserver.h
diff --git a/modules/stream_filter/dash/dash.cpp b/modules/demux/dash/dash.cpp
similarity index 100%
rename from modules/stream_filter/dash/dash.cpp
rename to modules/demux/dash/dash.cpp
diff --git a/modules/stream_filter/dash/dash.hpp b/modules/demux/dash/dash.hpp
similarity index 100%
rename from modules/stream_filter/dash/dash.hpp
rename to modules/demux/dash/dash.hpp
diff --git a/modules/stream_filter/dash/http/Chunk.cpp b/modules/demux/dash/http/Chunk.cpp
similarity index 100%
rename from modules/stream_filter/dash/http/Chunk.cpp
rename to modules/demux/dash/http/Chunk.cpp
diff --git a/modules/stream_filter/dash/http/Chunk.h b/modules/demux/dash/http/Chunk.h
similarity index 100%
rename from modules/stream_filter/dash/http/Chunk.h
rename to modules/demux/dash/http/Chunk.h
diff --git a/modules/stream_filter/dash/http/HTTPConnection.cpp b/modules/demux/dash/http/HTTPConnection.cpp
similarity index 100%
rename from modules/stream_filter/dash/http/HTTPConnection.cpp
rename to modules/demux/dash/http/HTTPConnection.cpp
diff --git a/modules/stream_filter/dash/http/HTTPConnection.h b/modules/demux/dash/http/HTTPConnection.h
similarity index 100%
rename from modules/stream_filter/dash/http/HTTPConnection.h
rename to modules/demux/dash/http/HTTPConnection.h
diff --git a/modules/stream_filter/dash/http/HTTPConnectionManager.cpp b/modules/demux/dash/http/HTTPConnectionManager.cpp
similarity index 100%
rename from modules/stream_filter/dash/http/HTTPConnectionManager.cpp
rename to modules/demux/dash/http/HTTPConnectionManager.cpp
diff --git a/modules/stream_filter/dash/http/HTTPConnectionManager.h b/modules/demux/dash/http/HTTPConnectionManager.h
similarity index 100%
rename from modules/stream_filter/dash/http/HTTPConnectionManager.h
rename to modules/demux/dash/http/HTTPConnectionManager.h
diff --git a/modules/stream_filter/dash/http/IHTTPConnection.cpp b/modules/demux/dash/http/IHTTPConnection.cpp
similarity index 100%
rename from modules/stream_filter/dash/http/IHTTPConnection.cpp
rename to modules/demux/dash/http/IHTTPConnection.cpp
diff --git a/modules/stream_filter/dash/http/IHTTPConnection.h b/modules/demux/dash/http/IHTTPConnection.h
similarity index 100%
rename from modules/stream_filter/dash/http/IHTTPConnection.h
rename to modules/demux/dash/http/IHTTPConnection.h
diff --git a/modules/stream_filter/dash/http/PersistentConnection.cpp b/modules/demux/dash/http/PersistentConnection.cpp
similarity index 100%
rename from modules/stream_filter/dash/http/PersistentConnection.cpp
rename to modules/demux/dash/http/PersistentConnection.cpp
diff --git a/modules/stream_filter/dash/http/PersistentConnection.h b/modules/demux/dash/http/PersistentConnection.h
similarity index 100%
rename from modules/stream_filter/dash/http/PersistentConnection.h
rename to modules/demux/dash/http/PersistentConnection.h
diff --git a/modules/stream_filter/dash/mp4/AtomsReader.cpp b/modules/demux/dash/mp4/AtomsReader.cpp
similarity index 100%
rename from modules/stream_filter/dash/mp4/AtomsReader.cpp
rename to modules/demux/dash/mp4/AtomsReader.cpp
diff --git a/modules/stream_filter/dash/mp4/AtomsReader.hpp b/modules/demux/dash/mp4/AtomsReader.hpp
similarity index 100%
rename from modules/stream_filter/dash/mp4/AtomsReader.hpp
rename to modules/demux/dash/mp4/AtomsReader.hpp
diff --git a/modules/stream_filter/dash/mpd/AdaptationSet.cpp b/modules/demux/dash/mpd/AdaptationSet.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/AdaptationSet.cpp
rename to modules/demux/dash/mpd/AdaptationSet.cpp
diff --git a/modules/stream_filter/dash/mpd/AdaptationSet.h b/modules/demux/dash/mpd/AdaptationSet.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/AdaptationSet.h
rename to modules/demux/dash/mpd/AdaptationSet.h
diff --git a/modules/stream_filter/dash/mpd/BaseUrl.h b/modules/demux/dash/mpd/BaseUrl.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/BaseUrl.h
rename to modules/demux/dash/mpd/BaseUrl.h
diff --git a/modules/stream_filter/dash/mpd/CommonAttributesElements.cpp b/modules/demux/dash/mpd/CommonAttributesElements.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/CommonAttributesElements.cpp
rename to modules/demux/dash/mpd/CommonAttributesElements.cpp
diff --git a/modules/stream_filter/dash/mpd/CommonAttributesElements.h b/modules/demux/dash/mpd/CommonAttributesElements.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/CommonAttributesElements.h
rename to modules/demux/dash/mpd/CommonAttributesElements.h
diff --git a/modules/stream_filter/dash/mpd/ContentDescription.cpp b/modules/demux/dash/mpd/ContentDescription.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/ContentDescription.cpp
rename to modules/demux/dash/mpd/ContentDescription.cpp
diff --git a/modules/stream_filter/dash/mpd/ContentDescription.h b/modules/demux/dash/mpd/ContentDescription.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/ContentDescription.h
rename to modules/demux/dash/mpd/ContentDescription.h
diff --git a/modules/stream_filter/dash/mpd/ICanonicalUrl.hpp b/modules/demux/dash/mpd/ICanonicalUrl.hpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/ICanonicalUrl.hpp
rename to modules/demux/dash/mpd/ICanonicalUrl.hpp
diff --git a/modules/stream_filter/dash/mpd/IMPDParser.cpp b/modules/demux/dash/mpd/IMPDParser.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/IMPDParser.cpp
rename to modules/demux/dash/mpd/IMPDParser.cpp
diff --git a/modules/stream_filter/dash/mpd/IMPDParser.h b/modules/demux/dash/mpd/IMPDParser.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/IMPDParser.h
rename to modules/demux/dash/mpd/IMPDParser.h
diff --git a/modules/stream_filter/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/IsoffMainParser.cpp
rename to modules/demux/dash/mpd/IsoffMainParser.cpp
diff --git a/modules/stream_filter/dash/mpd/IsoffMainParser.h b/modules/demux/dash/mpd/IsoffMainParser.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/IsoffMainParser.h
rename to modules/demux/dash/mpd/IsoffMainParser.h
diff --git a/modules/stream_filter/dash/mpd/MPD.cpp b/modules/demux/dash/mpd/MPD.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/MPD.cpp
rename to modules/demux/dash/mpd/MPD.cpp
diff --git a/modules/stream_filter/dash/mpd/MPD.h b/modules/demux/dash/mpd/MPD.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/MPD.h
rename to modules/demux/dash/mpd/MPD.h
diff --git a/modules/stream_filter/dash/mpd/MPDFactory.cpp b/modules/demux/dash/mpd/MPDFactory.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/MPDFactory.cpp
rename to modules/demux/dash/mpd/MPDFactory.cpp
diff --git a/modules/stream_filter/dash/mpd/MPDFactory.h b/modules/demux/dash/mpd/MPDFactory.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/MPDFactory.h
rename to modules/demux/dash/mpd/MPDFactory.h
diff --git a/modules/stream_filter/dash/mpd/Period.cpp b/modules/demux/dash/mpd/Period.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/Period.cpp
rename to modules/demux/dash/mpd/Period.cpp
diff --git a/modules/stream_filter/dash/mpd/Period.h b/modules/demux/dash/mpd/Period.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/Period.h
rename to modules/demux/dash/mpd/Period.h
diff --git a/modules/stream_filter/dash/mpd/Profile.cpp b/modules/demux/dash/mpd/Profile.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/Profile.cpp
rename to modules/demux/dash/mpd/Profile.cpp
diff --git a/modules/stream_filter/dash/mpd/Profile.hpp b/modules/demux/dash/mpd/Profile.hpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/Profile.hpp
rename to modules/demux/dash/mpd/Profile.hpp
diff --git a/modules/stream_filter/dash/mpd/ProgramInformation.cpp b/modules/demux/dash/mpd/ProgramInformation.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/ProgramInformation.cpp
rename to modules/demux/dash/mpd/ProgramInformation.cpp
diff --git a/modules/stream_filter/dash/mpd/ProgramInformation.h b/modules/demux/dash/mpd/ProgramInformation.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/ProgramInformation.h
rename to modules/demux/dash/mpd/ProgramInformation.h
diff --git a/modules/stream_filter/dash/mpd/Representation.cpp b/modules/demux/dash/mpd/Representation.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/Representation.cpp
rename to modules/demux/dash/mpd/Representation.cpp
diff --git a/modules/stream_filter/dash/mpd/Representation.h b/modules/demux/dash/mpd/Representation.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/Representation.h
rename to modules/demux/dash/mpd/Representation.h
diff --git a/modules/stream_filter/dash/mpd/Segment.cpp b/modules/demux/dash/mpd/Segment.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/Segment.cpp
rename to modules/demux/dash/mpd/Segment.cpp
diff --git a/modules/stream_filter/dash/mpd/Segment.h b/modules/demux/dash/mpd/Segment.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/Segment.h
rename to modules/demux/dash/mpd/Segment.h
diff --git a/modules/stream_filter/dash/mpd/SegmentBase.cpp b/modules/demux/dash/mpd/SegmentBase.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentBase.cpp
rename to modules/demux/dash/mpd/SegmentBase.cpp
diff --git a/modules/stream_filter/dash/mpd/SegmentBase.h b/modules/demux/dash/mpd/SegmentBase.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentBase.h
rename to modules/demux/dash/mpd/SegmentBase.h
diff --git a/modules/stream_filter/dash/mpd/SegmentInfo.cpp b/modules/demux/dash/mpd/SegmentInfo.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentInfo.cpp
rename to modules/demux/dash/mpd/SegmentInfo.cpp
diff --git a/modules/stream_filter/dash/mpd/SegmentInfo.h b/modules/demux/dash/mpd/SegmentInfo.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentInfo.h
rename to modules/demux/dash/mpd/SegmentInfo.h
diff --git a/modules/stream_filter/dash/mpd/SegmentInfoCommon.cpp b/modules/demux/dash/mpd/SegmentInfoCommon.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentInfoCommon.cpp
rename to modules/demux/dash/mpd/SegmentInfoCommon.cpp
diff --git a/modules/stream_filter/dash/mpd/SegmentInfoCommon.h b/modules/demux/dash/mpd/SegmentInfoCommon.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentInfoCommon.h
rename to modules/demux/dash/mpd/SegmentInfoCommon.h
diff --git a/modules/stream_filter/dash/mpd/SegmentInfoDefault.cpp b/modules/demux/dash/mpd/SegmentInfoDefault.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentInfoDefault.cpp
rename to modules/demux/dash/mpd/SegmentInfoDefault.cpp
diff --git a/modules/stream_filter/dash/mpd/SegmentInfoDefault.h b/modules/demux/dash/mpd/SegmentInfoDefault.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentInfoDefault.h
rename to modules/demux/dash/mpd/SegmentInfoDefault.h
diff --git a/modules/stream_filter/dash/mpd/SegmentInformation.cpp b/modules/demux/dash/mpd/SegmentInformation.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentInformation.cpp
rename to modules/demux/dash/mpd/SegmentInformation.cpp
diff --git a/modules/stream_filter/dash/mpd/SegmentInformation.hpp b/modules/demux/dash/mpd/SegmentInformation.hpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentInformation.hpp
rename to modules/demux/dash/mpd/SegmentInformation.hpp
diff --git a/modules/stream_filter/dash/mpd/SegmentList.cpp b/modules/demux/dash/mpd/SegmentList.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentList.cpp
rename to modules/demux/dash/mpd/SegmentList.cpp
diff --git a/modules/stream_filter/dash/mpd/SegmentList.h b/modules/demux/dash/mpd/SegmentList.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentList.h
rename to modules/demux/dash/mpd/SegmentList.h
diff --git a/modules/stream_filter/dash/mpd/SegmentTemplate.cpp b/modules/demux/dash/mpd/SegmentTemplate.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentTemplate.cpp
rename to modules/demux/dash/mpd/SegmentTemplate.cpp
diff --git a/modules/stream_filter/dash/mpd/SegmentTemplate.h b/modules/demux/dash/mpd/SegmentTemplate.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentTemplate.h
rename to modules/demux/dash/mpd/SegmentTemplate.h
diff --git a/modules/stream_filter/dash/mpd/SegmentTimeline.cpp b/modules/demux/dash/mpd/SegmentTimeline.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentTimeline.cpp
rename to modules/demux/dash/mpd/SegmentTimeline.cpp
diff --git a/modules/stream_filter/dash/mpd/SegmentTimeline.h b/modules/demux/dash/mpd/SegmentTimeline.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/SegmentTimeline.h
rename to modules/demux/dash/mpd/SegmentTimeline.h
diff --git a/modules/stream_filter/dash/mpd/TrickModeType.cpp b/modules/demux/dash/mpd/TrickModeType.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/TrickModeType.cpp
rename to modules/demux/dash/mpd/TrickModeType.cpp
diff --git a/modules/stream_filter/dash/mpd/TrickModeType.h b/modules/demux/dash/mpd/TrickModeType.h
similarity index 100%
rename from modules/stream_filter/dash/mpd/TrickModeType.h
rename to modules/demux/dash/mpd/TrickModeType.h
diff --git a/modules/stream_filter/dash/mpd/Url.cpp b/modules/demux/dash/mpd/Url.cpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/Url.cpp
rename to modules/demux/dash/mpd/Url.cpp
diff --git a/modules/stream_filter/dash/mpd/Url.hpp b/modules/demux/dash/mpd/Url.hpp
similarity index 100%
rename from modules/stream_filter/dash/mpd/Url.hpp
rename to modules/demux/dash/mpd/Url.hpp
diff --git a/modules/stream_filter/dash/xml/DOMHelper.cpp b/modules/demux/dash/xml/DOMHelper.cpp
similarity index 100%
rename from modules/stream_filter/dash/xml/DOMHelper.cpp
rename to modules/demux/dash/xml/DOMHelper.cpp
diff --git a/modules/stream_filter/dash/xml/DOMHelper.h b/modules/demux/dash/xml/DOMHelper.h
similarity index 100%
rename from modules/stream_filter/dash/xml/DOMHelper.h
rename to modules/demux/dash/xml/DOMHelper.h
diff --git a/modules/stream_filter/dash/xml/DOMParser.cpp b/modules/demux/dash/xml/DOMParser.cpp
similarity index 100%
rename from modules/stream_filter/dash/xml/DOMParser.cpp
rename to modules/demux/dash/xml/DOMParser.cpp
diff --git a/modules/stream_filter/dash/xml/DOMParser.h b/modules/demux/dash/xml/DOMParser.h
similarity index 100%
rename from modules/stream_filter/dash/xml/DOMParser.h
rename to modules/demux/dash/xml/DOMParser.h
diff --git a/modules/stream_filter/dash/xml/Node.cpp b/modules/demux/dash/xml/Node.cpp
similarity index 100%
rename from modules/stream_filter/dash/xml/Node.cpp
rename to modules/demux/dash/xml/Node.cpp
diff --git a/modules/stream_filter/dash/xml/Node.h b/modules/demux/dash/xml/Node.h
similarity index 100%
rename from modules/stream_filter/dash/xml/Node.h
rename to modules/demux/dash/xml/Node.h
diff --git a/modules/stream_filter/Makefile.am b/modules/stream_filter/Makefile.am
index 533bac1faa90debaf7d8bdc68f7fd74014dd6b08..043be24324138ea28af753ef70638c28fe125566 100644
--- a/modules/stream_filter/Makefile.am
+++ b/modules/stream_filter/Makefile.am
@@ -8,108 +8,6 @@ if !HAVE_WIN32
stream_filter_LTLIBRARIES += libdecomp_plugin.la
endif
-libdash_plugin_la_SOURCES = \
- stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp \
- stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h \
- stream_filter/dash/adaptationlogic/AdaptationLogicFactory.cpp \
- stream_filter/dash/adaptationlogic/AdaptationLogicFactory.h \
- stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp \
- stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h \
- stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp \
- stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp \
- stream_filter/dash/adaptationlogic/IAdaptationLogic.h \
- stream_filter/dash/adaptationlogic/IDownloadRateObserver.h \
- stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h \
- stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp \
- stream_filter/dash/adaptationlogic/Representationselectors.hpp \
- stream_filter/dash/adaptationlogic/Representationselectors.cpp \
- stream_filter/dash/buffer/BlockBuffer.cpp \
- stream_filter/dash/buffer/BlockBuffer.h \
- stream_filter/dash/buffer/IBufferObserver.h \
- stream_filter/dash/http/Chunk.cpp \
- stream_filter/dash/http/Chunk.h \
- stream_filter/dash/http/HTTPConnection.cpp \
- stream_filter/dash/http/HTTPConnection.h \
- stream_filter/dash/http/HTTPConnectionManager.cpp \
- stream_filter/dash/http/HTTPConnectionManager.h \
- stream_filter/dash/http/IHTTPConnection.cpp \
- stream_filter/dash/http/IHTTPConnection.h \
- stream_filter/dash/http/PersistentConnection.cpp \
- stream_filter/dash/http/PersistentConnection.h \
- stream_filter/dash/mpd/AdaptationSet.cpp \
- stream_filter/dash/mpd/AdaptationSet.h \
- stream_filter/dash/mpd/BaseUrl.h \
- stream_filter/dash/mpd/CommonAttributesElements.cpp \
- stream_filter/dash/mpd/CommonAttributesElements.h \
- stream_filter/dash/mpd/ContentDescription.cpp \
- stream_filter/dash/mpd/ContentDescription.h \
- stream_filter/dash/mpd/ICanonicalUrl.hpp \
- stream_filter/dash/mpd/IMPDParser.cpp \
- stream_filter/dash/mpd/IMPDParser.h \
- stream_filter/dash/mpd/IsoffMainParser.cpp \
- stream_filter/dash/mpd/IsoffMainParser.h \
- stream_filter/dash/mpd/MPD.cpp \
- stream_filter/dash/mpd/MPD.h \
- stream_filter/dash/mpd/MPDFactory.cpp \
- stream_filter/dash/mpd/MPDFactory.h \
- stream_filter/dash/mpd/Period.cpp \
- stream_filter/dash/mpd/Period.h \
- stream_filter/dash/mpd/Profile.cpp \
- stream_filter/dash/mpd/Profile.hpp \
- stream_filter/dash/mpd/ProgramInformation.cpp \
- stream_filter/dash/mpd/ProgramInformation.h \
- stream_filter/dash/mpd/Representation.cpp \
- stream_filter/dash/mpd/Representation.h \
- stream_filter/dash/mpd/Segment.cpp \
- stream_filter/dash/mpd/Segment.h \
- stream_filter/dash/mpd/SegmentBase.cpp \
- stream_filter/dash/mpd/SegmentBase.h \
- stream_filter/dash/mpd/SegmentInfo.cpp \
- stream_filter/dash/mpd/SegmentInfo.h \
- stream_filter/dash/mpd/SegmentInfoCommon.cpp \
- stream_filter/dash/mpd/SegmentInfoCommon.h \
- stream_filter/dash/mpd/SegmentInfoDefault.cpp \
- stream_filter/dash/mpd/SegmentInfoDefault.h \
- stream_filter/dash/mpd/SegmentInformation.cpp \
- stream_filter/dash/mpd/SegmentInformation.hpp \
- stream_filter/dash/mpd/SegmentList.cpp \
- stream_filter/dash/mpd/SegmentList.h \
- stream_filter/dash/mpd/SegmentTemplate.cpp \
- stream_filter/dash/mpd/SegmentTemplate.h \
- stream_filter/dash/mpd/SegmentTimeline.cpp \
- stream_filter/dash/mpd/SegmentTimeline.h \
- stream_filter/dash/mpd/TrickModeType.cpp \
- stream_filter/dash/mpd/TrickModeType.h \
- stream_filter/dash/mpd/Url.cpp \
- stream_filter/dash/mpd/Url.hpp \
- stream_filter/dash/mp4/AtomsReader.cpp \
- stream_filter/dash/mp4/AtomsReader.hpp \
- stream_filter/dash/xml/DOMHelper.cpp \
- stream_filter/dash/xml/DOMHelper.h \
- stream_filter/dash/xml/DOMParser.cpp \
- stream_filter/dash/xml/DOMParser.h \
- stream_filter/dash/xml/Node.cpp \
- stream_filter/dash/xml/Node.h \
- stream_filter/dash/dash.cpp \
- stream_filter/dash/dash.hpp \
- stream_filter/dash/DASHManager.cpp \
- stream_filter/dash/DASHManager.h \
- stream_filter/dash/Helper.cpp \
- stream_filter/dash/Helper.h \
- stream_filter/dash/Properties.hpp \
- stream_filter/dash/StreamsType.hpp \
- stream_filter/dash/Streams.cpp \
- stream_filter/dash/Streams.hpp
-
-libdash_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h
-
-libdash_plugin_la_CXXFLAGS = $(AM_CFLAGS) -I$(srcdir)/stream_filter/dash
-libdash_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
-if HAVE_ZLIB
-libdash_plugin_la_LIBADD += -lz
-endif
-stream_filter_LTLIBRARIES += libdash_plugin.la
-
libsmooth_plugin_la_SOURCES = \
stream_filter/smooth/smooth.c \
stream_filter/smooth/utils.c \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 162293c466fa446590e2dff9c74b7b6fd0a8449c..4b7cddca7dbd56235e09088f1b5cc88042bfc1d9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -453,6 +453,7 @@ modules/demux/avi/libavi.c
modules/demux/avi/libavi.h
modules/demux/caf.c
modules/demux/cdg.c
+modules/demux/dash/dash.cpp
modules/demux/demuxdump.c
modules/demux/dirac.c
modules/demux/flac.c
@@ -1017,7 +1018,6 @@ modules/services_discovery/upnp.cpp
modules/services_discovery/windrive.c
modules/services_discovery/xcb_apps.c
modules/stream_filter/aribcam.c
-modules/stream_filter/dash/dash.cpp
modules/stream_filter/decomp.c
modules/stream_filter/hds/hds.c
modules/stream_filter/httplive.c