Changeset 7f20440b in ffmpeg

Timestamp:

Sep 17, 2013, 2:04:41 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8d0b899e

Parents:

5d12ec8f (diff), 7f8d41eb (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> (09/17/13 13:57:15)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/17/13 14:04:41)

Message:

Merge commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52'

• commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52': mov: Don't use a negative duration for setting other fields

Conflicts:

libavformat/mov.c

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

(No files)