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)
* commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee':
  dashenc: increase buffer time hint in the manifest

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

Simple merge