[FFmpeg-cvslog] Merge commit 'd347a7b248d4ffdc278373fecf033b0ade030343'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct  5 11:13:38 2013 +0200| [5de251a3e32e75c01bfc0c66be628fb9f07fdd04] | committer: Michael Niedermayer

Merge commit 'd347a7b248d4ffdc278373fecf033b0ade030343'

* commit 'd347a7b248d4ffdc278373fecf033b0ade030343':
  ismindex: Use the individual stream duration instead of the global one

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

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