Merge commit '583a287f6f48f263859df142e6f90993e4217c72'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Oct 2013 09:28:58 +0000 (11:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Oct 2013 09:29:02 +0000 (11:29 +0200)
* commit '583a287f6f48f263859df142e6f90993e4217c72':
  ismindex: Calculate the file duration among the included tracks

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

Simple merge