From 7fabab9c1478c2630077bceba11459efa9a622c3 Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@google.com>
Date: Wed, 11 Nov 2015 04:05:34 -0800
Subject: [PATCH] Always inherit ContentProtection from AdaptationSet

Fixes #230

Change-Id: Ie1dc63de83a40c270c586f8aee98fa98c214ecb8
---
 lib/dash/mpd_parser.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/dash/mpd_parser.js b/lib/dash/mpd_parser.js
index 2500161600..0b578ece75 100644
--- a/lib/dash/mpd_parser.js
+++ b/lib/dash/mpd_parser.js
@@ -1176,9 +1176,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);
 };