Merge commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 23:56:02 +0000 (01:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 23:56:11 +0000 (01:56 +0200)
commit28b7d7a36d0ee6458853af089b7ca193c03f1f10
tree549fc39652fd584e13a0e06fe8d19de98d20f71b
parentae99f06e5a5f8010a0050bbb05636515d92064f9
parentb8d2630c5327d2818d05c8a48be0417905d8e0fd
Merge commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd'

* commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd':
  dashenc: Reduce the segment duration if cutting out parts with edit lists

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dashenc.c