From: Rodger Combs <rodger.combs@gmail.com>
Date: Tue, 26 Sep 2017 17:11:02 +0000 (-0300)
Subject: Merge commit 'efd2fc41b3f0749f9715d50b581f22bbaa8c5b99'
X-Git-Tag: n3.5-dev~247
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c0fae3ff902e772d1c98a192d982893b2e8f1105

Merge commit 'efd2fc41b3f0749f9715d50b581f22bbaa8c5b99'

* commit 'efd2fc41b3f0749f9715d50b581f22bbaa8c5b99':
  dashenc: allow assigning all streams of a media type to an AdaptationSet

Merged-by: Rodger Combs <rodger.combs@gmail.com>
---

c0fae3ff902e772d1c98a192d982893b2e8f1105