Changeset 6e2d3ba0 in ffmpeg

Timestamp:

Jan 17, 2014, 3:18:40 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cd259cda

Parents:

206c06d9 (diff), 5ef11b8d (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 15:18:27)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/17/14 15:18:40)

Message:

Merge commit '5ef11b8dcc054b230deb9b20493255c14a80597d'

• commit '5ef11b8dcc054b230deb9b20493255c14a80597d': yuv4mpeg: set average frame rate

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

(No files)