Changeset 405b1ef8 in ffmpeg

Timestamp:

Jan 4, 2014, 12:07:05 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3929c174

Parents:

c13e73c2 (diff), 24057c83 (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/04/14 00:05:52)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/04/14 00:07:05)

Message:

Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'

• commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c': eacmv: check the framerate before setting it.

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

(No files)