Merge commit '456e93bfdd4cbc5e995dea415019abd0703d0e16'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Dec 2014 10:57:35 +0000 (11:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Dec 2014 11:05:00 +0000 (12:05 +0100)
commit973684a4fba91b9c188b3a19d22e59ffaad79be8
tree5a5bc456511c3d58a5e140ab80e8bd478c8920d2
parentb32cb08b7f43ee017034061eb50273c3596014d5
parent456e93bfdd4cbc5e995dea415019abd0703d0e16
Merge commit '456e93bfdd4cbc5e995dea415019abd0703d0e16'

* commit '456e93bfdd4cbc5e995dea415019abd0703d0e16':
  dashenc: Adjust the start time of a segment to the end of the previous segment

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