[vlc-commits] demux: smooth: fix MaxWidth/Height

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Nov  3 00:39:23 2015 +0100| [1bd5110b5b849f37db12283b4b4cc8722c080a55] | committer: Francois Cartegnie

demux: smooth: fix MaxWidth/Height

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

 modules/demux/smooth/playlist/Parser.cpp |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/demux/smooth/playlist/Parser.cpp b/modules/demux/smooth/playlist/Parser.cpp
index bc163ab..8d2c2ea 100644
--- a/modules/demux/smooth/playlist/Parser.cpp
+++ b/modules/demux/smooth/playlist/Parser.cpp
@@ -149,10 +149,14 @@ static void ParseQualityLevel(BaseAdaptationSet *adaptSet, Node *qualNode, const
             if(qualNode->hasAttribute("Bitrate"))
                 rep->setBandwidth(Integer<uint64_t>(qualNode->getAttributeValue("Bitrate")));
 
-            if(qualNode->hasAttribute("Width"))
+            if(qualNode->hasAttribute("MaxWidth"))
+                rep->setWidth(Integer<uint64_t>(qualNode->getAttributeValue("MaxWidth")));
+            else if(qualNode->hasAttribute("Width"))
                 rep->setWidth(Integer<uint64_t>(qualNode->getAttributeValue("Width")));
 
-            if(qualNode->hasAttribute("Height"))
+            if(qualNode->hasAttribute("MaxHeight"))
+                rep->setHeight(Integer<uint64_t>(qualNode->getAttributeValue("MaxHeight")));
+            else if(qualNode->hasAttribute("Height"))
                 rep->setHeight(Integer<uint64_t>(qualNode->getAttributeValue("Height")));
 
             ForgedInitSegment *initSegment = new (std::nothrow)