[vlc-commits] dash: Fixing SegmentInfoDefault parsing.

[Hugo Beauzée-Luyssen]

vlc/vlc-1.2 | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Thu Jan  5 18:23:52 2012 +0100| [3fff15a4c54028a9713281f2d99e6142baf4ef68] | committer: Jean-Baptiste Kempf

dash: Fixing SegmentInfoDefault parsing.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit d3086feaa17f818ac945eba7d460fa8edb4688ef)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=3fff15a4c54028a9713281f2d99e6142baf4ef68
---

 modules/stream_filter/dash/mpd/BasicCMParser.cpp |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/stream_filter/dash/mpd/BasicCMParser.cpp b/modules/stream_filter/dash/mpd/BasicCMParser.cpp
index ccfead6..ee0bd38 100644
--- a/modules/stream_filter/dash/mpd/BasicCMParser.cpp
+++ b/modules/stream_filter/dash/mpd/BasicCMParser.cpp
@@ -266,6 +266,7 @@ void    BasicCMParser::setGroups            (Node *root, Period *period)
         std::map<std::string, std::string>::const_iterator  it = attr.find( "subsegmentAlignmentFlag" );
         if ( it != attr.end() && it->second == "true" )
             group->setSubsegmentAlignmentFlag( true ); //Otherwise it is false by default.
+        this->parseSegmentInfoDefault( groups.at( i ), group );
         this->setRepresentations(groups.at(i), group);
         period->addGroup(group);
     }
@@ -361,9 +362,7 @@ bool    BasicCMParser::setSegmentInfo       (Node *root, Representation *rep)
 
     if ( segmentInfo )
     {
-        const std::map<std::string, std::string> attr = segmentInfo->getAttributes();
-
-        SegmentInfo *info = new SegmentInfo();
+        SegmentInfo *info = new SegmentInfo;
         this->parseSegmentInfoCommon( segmentInfo, info );
         //If we don't have any segment, there's no point keeping this SegmentInfo.
         if ( this->setSegments( segmentInfo, info ) == false )