Changeset 922596e3 in ffmpeg

Timestamp:

Oct 5, 2013, 9:35:39 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9665217a

Parents:

47a57c68 (diff), a4435f92 (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> (10/05/13 09:35:34)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/05/13 09:35:39)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: ismindex: Change the duration field to int64_t

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

(No files)