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)
commit3f7a8bb67b27bd3c32f3932096033a1787405601
tree526a7f4dbac162b54709708d5c722743cbc29a9d
parentc0fae3ff902e772d1c98a192d982893b2e8f1105
parentca9bc9de690258d4761a19b0df6e9c9113b80115
Merge commit 'ca9bc9de690258d4761a19b0df6e9c9113b80115'

* commit 'ca9bc9de690258d4761a19b0df6e9c9113b80115':
  dashenc: default to one AdaptationSet per stream

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