Merge commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18'
authorClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:37:04 +0000 (16:37 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:37:04 +0000 (16:37 +0200)
commit77a20cff3628b7353164b8433a6b4d4140c901bf
tree20c530b64f5bcb24de8b913bb40b83e1cf840ad0
parent93bf0480c2dba12990f92cdf1927da2ff64db0cd
parent95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18
Merge commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18'

* commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18':
  dashenc: add mandatory id to AdaptationSet and Period in manifest

Merged-by: Clément Bœsch <u@pkh.me>
libavformat/dashenc.c