vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Tue Nov 18 
16:06:31 2014 +0100| [1134fcdfe543f5c5ec9c2df486f9b69daa3628b1] | committer: 
Francois Cartegnie

stream_filter: dash: switch default parser

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1134fcdfe543f5c5ec9c2df486f9b69daa3628b1
---

 modules/stream_filter/dash/mpd/MPDFactory.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/stream_filter/dash/mpd/MPDFactory.cpp 
b/modules/stream_filter/dash/mpd/MPDFactory.cpp
index ecfc567..9225b89 100644
--- a/modules/stream_filter/dash/mpd/MPDFactory.cpp
+++ b/modules/stream_filter/dash/mpd/MPDFactory.cpp
@@ -36,8 +36,8 @@ MPD* MPDFactory::create             (dash::xml::Node *root, 
stream_t *p_stream,
     switch( profile )
     {
         case dash::mpd::Profile::Full:
-        case dash::mpd::Profile::ISOOnDemand:
             return MPDFactory::createBasicCMMPD(root, p_stream);
+        case dash::mpd::Profile::ISOOnDemand:
         case dash::mpd::Profile::ISOMain:
             return MPDFactory::createIsoffMainMPD(root, p_stream);
 
@@ -50,7 +50,7 @@ MPD* MPDFactory::createBasicCMMPD    (dash::xml::Node *root, 
stream_t *p_stream)
 
     if(mpdParser.parse() == false || mpdParser.getMPD() == NULL)
         return NULL;
-    mpdParser.getMPD()->setProfile( dash::mpd::Profile::ISOOnDemand );
+    mpdParser.getMPD()->setProfile( Profile(Profile::ISOOnDemand) );
     return mpdParser.getMPD();
 }
 MPD* MPDFactory::createIsoffMainMPD  (dash::xml::Node *root, stream_t 
*p_stream)
@@ -59,6 +59,6 @@ MPD* MPDFactory::createIsoffMainMPD  (dash::xml::Node *root, 
stream_t *p_stream)
 
     if(mpdParser.parse() == false || mpdParser.getMPD() == NULL)
         return NULL;
-    mpdParser.getMPD()->setProfile( dash::mpd::Profile::ISOMain );
+    mpdParser.getMPD()->setProfile( Profile(Profile::ISOMain) );
     return mpdParser.getMPD();
 }

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to