Merge commit 'dce2929efa8e82b0832a828f7e8cb81ff8c20a4e'
authorRodger Combs <rodger.combs@gmail.com>
Tue, 26 Sep 2017 17:11:50 +0000 (14:11 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 17:11:50 +0000 (14:11 -0300)
commit5c9373385d1a1d940b84f71fb583dc5519b17b8a
treeaa155708698e9e18c740c0f17703080e73a848d4
parent3f7a8bb67b27bd3c32f3932096033a1787405601
parentdce2929efa8e82b0832a828f7e8cb81ff8c20a4e
Merge commit 'dce2929efa8e82b0832a828f7e8cb81ff8c20a4e'

* commit 'dce2929efa8e82b0832a828f7e8cb81ff8c20a4e':
  dashenc: copy language and role metadata from streams assigned to sets

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