Changeset 3f3867ca in ffmpeg

Timestamp:

Sep 23, 2013, 1:04:09 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

34b429d5

Parents:

35603134 (diff), 231e5015 (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/23/13 13:04:05)

git-committer:

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

Message:

Merge remote-tracking branch 'cigaes/master'

• cigaes/master: lavfi/dualinput: reimplement on top of framesync. lavfi: add an API to synchronize multiple video inputs.

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

(No files)