Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 13:00:32 +0000 (14:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 13:00:39 +0000 (14:00 +0100)
* commit '30a041887f89cd97c372ad6a516da6e012f2c88b':
  ismindex: Calculate the pts duration of trun atoms, not the dts duration

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

Simple merge