From: Clément Bœsch <u@pkh.me>
Date: Sat, 20 May 2017 14:39:10 +0000 (+0200)
Subject: Merge commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ba3adea9575cb95a898c738b1f231d989db659e9;p=ffmpeg

Merge commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee'

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

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

ba3adea9575cb95a898c738b1f231d989db659e9