Merge commit 'e519dcd937c7c98815ba9884867590e302272016'
authorClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:55:22 +0000 (16:55 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:55:22 +0000 (16:55 +0200)
* commit 'e519dcd937c7c98815ba9884867590e302272016':
  dashenc: separate segments based on current segment duration

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

Simple merge