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)
* commit 'efd2fc41b3f0749f9715d50b581f22bbaa8c5b99':
  dashenc: allow assigning all streams of a media type to an AdaptationSet

Merged-by: Rodger Combs <rodger.combs@gmail.com>
1  2 
libavformat/dashenc.c

Simple merge