[FFmpeg-cvslog] Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 19 14:00:32 2015 +0100| [5440d4b68b6af942ea460f0eb391b7f2442b5f50] | committer: Michael Niedermayer

Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b'

* commit '30a041887f89cd97c372ad6a516da6e012f2c88b':
  ismindex: Calculate the pts duration of trun atoms, not the dts duration

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

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