Changeset c16470d7 in ffmpeg

Timestamp:

Sep 20, 2013, 8:57:20 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c652662

Parents:

f6622f96 (diff), 5f408333 (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/20/13 08:56:54)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/20/13 08:57:20)

Message:

Merge commit '5f408333601a827054335f309defcb246a532b21'

• commit '5f408333601a827054335f309defcb246a532b21': asfdec: substract preroll time from marker presentation time

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

(No files)