Merge commit '3d23a5f96ad72961c14ba3a0c2add8f2ab374b61'
authorRodger Combs <rodger.combs@gmail.com>
Tue, 26 Sep 2017 17:10:30 +0000 (14:10 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 17:10:30 +0000 (14:10 -0300)
commit777d53c793a2f19b9f87d935fcb16f07ceae0dca
treece6c82e7ed338bcd994fb413156ada2e27e7ddc2
parent3b9ef13588360b16c22ece7521ebd9b11f9ffb17
parent3d23a5f96ad72961c14ba3a0c2add8f2ab374b61
Merge commit '3d23a5f96ad72961c14ba3a0c2add8f2ab374b61'

* commit '3d23a5f96ad72961c14ba3a0c2add8f2ab374b61':
  dashenc: add support for assigning streams to AdaptationSets

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