Changeset 5440d4b6 in ffmpeg

Timestamp:

Mar 19, 2015, 1:00:39 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c3a6d179

Parents:

b5448e66 (diff), 30a04188 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/19/15 13:00:32)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/19/15 13:00:39)

Message:

Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b'

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

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

(No files)