Merge commit 'efd2fc41b3f0749f9715d50b581f22bbaa8c5b99'
authorRodger Combs <rodger.combs@gmail.com>
Tue, 26 Sep 2017 17:11:02 +0000 (14:11 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 17:11:02 +0000 (14:11 -0300)
commitc0fae3ff902e772d1c98a192d982893b2e8f1105
tree6eed1a1adb3f59dba86dd042d838e6bfb7691f8e
parent777d53c793a2f19b9f87d935fcb16f07ceae0dca
parentefd2fc41b3f0749f9715d50b581f22bbaa8c5b99
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>
libavformat/dashenc.c