Merge commit '9df9309d233f59d9706444a1e24ac24139f2640d'
authorRodger Combs <rodger.combs@gmail.com>
Tue, 26 Sep 2017 17:02:44 +0000 (14:02 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 17:02:44 +0000 (14:02 -0300)
commit3b9ef13588360b16c22ece7521ebd9b11f9ffb17
tree10ff233f24a6d7cc12baad4f420f45483215c008
parent52223ffe44614738499ea6c0068810e250fb7b26
parent9df9309d233f59d9706444a1e24ac24139f2640d
Merge commit '9df9309d233f59d9706444a1e24ac24139f2640d'

* commit '9df9309d233f59d9706444a1e24ac24139f2640d':
  dashenc: calculate stream bitrate from first segment if not available

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