[FFmpeg-cvslog] Merge commit '2f628d5943c12389c07d652d23d3916997f9f0f6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 17 11:36:23 2014 +0100| [b32cb08b7f43ee017034061eb50273c3596014d5] | committer: Michael Niedermayer

Merge commit '2f628d5943c12389c07d652d23d3916997f9f0f6'

* commit '2f628d5943c12389c07d652d23d3916997f9f0f6':
  dashenc: Write segment timelines properly if the timeline has gaps

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b32cb08b7f43ee017034061eb50273c3596014d5
---