Changeset c8b99f8a in ffmpeg

Timestamp:

Jan 17, 2014, 1:38:33 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

68ebf70f, ee3fc8aa

Parents:

9f3a555b (diff), 87acd33c (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> (01/17/14 13:38:30)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/17/14 13:38:33)

Message:

Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928'

• commit '87acd33c092ab9e7d73686627e9105d99c1e4928': aviocat: Add support for specifying the input duration

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

(No files)