Merge commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Sep 2014 20:31:43 +0000 (22:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Sep 2014 20:39:31 +0000 (22:39 +0200)
* commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc':
  ismindex: handle time discontinuities and nonzero start time

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

Simple merge