[FFmpeg-cvslog] Merge commit '583a287f6f48f263859df142e6f90993e4217c72'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct  5 11:28:58 2013 +0200| [47a57c6832d008f676837a9ee5f3a45b828c9ca1] | committer: Michael Niedermayer

Merge commit '583a287f6f48f263859df142e6f90993e4217c72'

* commit '583a287f6f48f263859df142e6f90993e4217c72':
  ismindex: Calculate the file duration among the included tracks

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

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