Merge commit '2f628d5943c12389c07d652d23d3916997f9f0f6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Dec 2014 10:36:23 +0000 (11:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Dec 2014 10:57:09 +0000 (11:57 +0100)
* commit '2f628d5943c12389c07d652d23d3916997f9f0f6':
  dashenc: Write segment timelines properly if the timeline has gaps

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

Simple merge