Changeset c9a9a7a1 in ffmpeg

Timestamp:

Nov 8, 2014, 12:04:04 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

33301f00

Parents:

e2e36a73 (diff), 9cbf70fa (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> (11/07/14 23:41:51)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/08/14 00:04:04)

Message:

Merge commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d'

• commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d': movenc: Write correct presentation timestamps in tfra

Conflicts:

libavformat/version.h

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

(No files)