AdaptveTree: relink aadpset in psshset if stream was merged to avoud …

…access to erased adpsets
xbmc · Jul 27, 2018 · 5061a1a · 5061a1a
1 parent 4e95976
commit 5061a1a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/common/AdaptiveTree.cpp b/src/common/AdaptiveTree.cpp
@@ -277,6 +277,10 @@ namespace adaptive
       {
         if ((*ba)->type_ == AUDIO && ba + 1 != ea && AdaptationSet::mergeable(*ba, *(ba + 1)))
         {
+          for (size_t i(1); i < psshSets_.size(); ++i)
+            if (psshSets_[i].adaptation_set_ == *ba)
+              psshSets_[i].adaptation_set_ = *(ba + 1);
+
           (*(ba + 1))->repesentations_.insert((*(ba + 1))->repesentations_.end(), (*ba)->repesentations_.begin(), (*ba)->repesentations_.end());
           (*ba)->repesentations_.clear();
           ba = (*bp)->adaptationSets_.erase(ba);