Always inherit ContentProtection from AdaptationSet

Fixes #230 Change-Id: Ie1dc63de83a40c270c586f8aee98fa98c214ecb8
shaka-project · Nov 11, 2015 · 61123e5 · 61123e5
1 parent 2015abf
commit 61123e5
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/dash/mpd_parser.js b/lib/dash/mpd_parser.js
@@ -1163,9 +1163,8 @@ shaka.dash.mpd.Representation.prototype.parse = function(parent, elem) {
                          mpd.mergeChild_(this, elem, parent.segmentTemplate) :
                          mpd.parseChild_(this, elem, mpd.SegmentTemplate);
 
-  if (this.contentProtections.length == 0) {
-    this.contentProtections = parent.contentProtections;
-  }
+  this.contentProtections =
+      this.contentProtections.concat(parent.contentProtections);
 };