Changeset 41e7e46c in ffmpeg

Timestamp:

Mar 25, 2014, 6:25:10 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8f20e3d4

Parents:

10e931d5 (diff), aa499568 (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> (03/25/14 18:24:40)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/25/14 18:25:10)

Message:

Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'

• commit 'aa499568afc01d59215eef7e5b14b949a9671afc': avconv: More descriptive message about framedrop

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

(No files)