Merge commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee'
authorClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:39:10 +0000 (16:39 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:39:10 +0000 (16:39 +0200)
commitba3adea9575cb95a898c738b1f231d989db659e9
tree4de82f4d8a28ae197038123a7bc297a493e7b3b2
parent77a20cff3628b7353164b8433a6b4d4140c901bf
parent3c2717e48dd8c5115f2be35c2afcabd8a1f67aee
Merge commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee'

* commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee':
  dashenc: increase buffer time hint in the manifest

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