Merge commit 'ca9bc9de690258d4761a19b0df6e9c9113b80115'
authorRodger Combs <rodger.combs@gmail.com>
Tue, 26 Sep 2017 17:11:25 +0000 (14:11 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 17:11:25 +0000 (14:11 -0300)
* commit 'ca9bc9de690258d4761a19b0df6e9c9113b80115':
  dashenc: default to one AdaptationSet per stream

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

Simple merge