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)
* commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd':
  dashenc: Reduce the segment duration if cutting out parts with edit lists

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

Simple merge