vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Jul 23 13:51:49 2015 +0200| [7b2c07c609ddcde8f74c378ddf9bf4873eb22fa1] | committer: Francois Cartegnie
demux: dash: fix includes relative path > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7b2c07c609ddcde8f74c378ddf9bf4873eb22fa1 --- modules/demux/dash/mp4/AtomsReader.cpp | 4 ++-- modules/demux/dash/mpd/DASHCommonAttributesElements.cpp | 2 +- modules/demux/dash/mpd/IsoffMainParser.cpp | 2 +- modules/demux/dash/mpd/IsoffMainParser.h | 2 +- modules/demux/dash/mpd/MPDFactory.cpp | 2 +- modules/demux/dash/mpd/MPDFactory.h | 4 ++-- modules/demux/dash/xml/DOMHelper.h | 2 +- modules/demux/dash/xml/DOMParser.h | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/demux/dash/mp4/AtomsReader.cpp b/modules/demux/dash/mp4/AtomsReader.cpp index 173d85f..a7b8205 100644 --- a/modules/demux/dash/mp4/AtomsReader.cpp +++ b/modules/demux/dash/mp4/AtomsReader.cpp @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #include "AtomsReader.hpp" -#include "mpd/Representation.h" -#include "mpd/MPD.h" +#include "../mpd/Representation.h" +#include "../mpd/MPD.h" using namespace dash::mp4; using namespace dash::mpd; diff --git a/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp b/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp index 95fe6a3..b34f4d5 100644 --- a/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp +++ b/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp @@ -27,7 +27,7 @@ #include "DASHCommonAttributesElements.h" -#include "mpd/ContentDescription.h" +#include "ContentDescription.h" #include <vlc_common.h> #include <vlc_arrays.h> diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp index 6ec3220..c4e665e 100644 --- a/modules/demux/dash/mpd/IsoffMainParser.cpp +++ b/modules/demux/dash/mpd/IsoffMainParser.cpp @@ -38,7 +38,7 @@ #include "AdaptationSet.h" #include "ProgramInformation.h" #include "DASHSegment.h" -#include "xml/DOMHelper.h" +#include "../xml/DOMHelper.h" #include <vlc_strings.h> #include <vlc_stream.h> #include <cstdio> diff --git a/modules/demux/dash/mpd/IsoffMainParser.h b/modules/demux/dash/mpd/IsoffMainParser.h index 5df9df5..e634630 100644 --- a/modules/demux/dash/mpd/IsoffMainParser.h +++ b/modules/demux/dash/mpd/IsoffMainParser.h @@ -30,7 +30,7 @@ #endif #include "../adaptative/playlist/SegmentInfoCommon.h" -#include "mpd/Profile.hpp" +#include "Profile.hpp" #include <cstdlib> #include <sstream> diff --git a/modules/demux/dash/mpd/MPDFactory.cpp b/modules/demux/dash/mpd/MPDFactory.cpp index f766dc8..1829feb 100644 --- a/modules/demux/dash/mpd/MPDFactory.cpp +++ b/modules/demux/dash/mpd/MPDFactory.cpp @@ -27,7 +27,7 @@ #endif #include "MPDFactory.h" -#include "mpd/IsoffMainParser.h" +#include "IsoffMainParser.h" using namespace dash::xml; using namespace dash::mpd; diff --git a/modules/demux/dash/mpd/MPDFactory.h b/modules/demux/dash/mpd/MPDFactory.h index aa3f1c6..e654178 100644 --- a/modules/demux/dash/mpd/MPDFactory.h +++ b/modules/demux/dash/mpd/MPDFactory.h @@ -24,8 +24,8 @@ #ifndef MPDFACTORY_H_ #define MPDFACTORY_H_ -#include "mpd/MPD.h" -#include "mpd/Profile.hpp" +#include "MPD.h" +#include "Profile.hpp" namespace dash { diff --git a/modules/demux/dash/xml/DOMHelper.h b/modules/demux/dash/xml/DOMHelper.h index 89f6400..573a8e4 100644 --- a/modules/demux/dash/xml/DOMHelper.h +++ b/modules/demux/dash/xml/DOMHelper.h @@ -28,7 +28,7 @@ #include <vector> #include <string> -#include "xml/Node.h" +#include "Node.h" namespace dash { diff --git a/modules/demux/dash/xml/DOMParser.h b/modules/demux/dash/xml/DOMParser.h index e9dd1d5..c50e7be 100644 --- a/modules/demux/dash/xml/DOMParser.h +++ b/modules/demux/dash/xml/DOMParser.h @@ -31,8 +31,8 @@ #include <vlc_common.h> -#include "xml/Node.h" -#include "mpd/Profile.hpp" +#include "Node.h" +#include "../mpd/Profile.hpp" namespace dash { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
