Changeset a72df4da in ffmpeg

Timestamp:

May 29, 2014, 11:07:33 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e46cc1da

Parents:

bc59d39 (diff), cf697771 (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> (05/29/14 11:05:35)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/29/14 11:07:33)

Message:

Merge commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9'

• commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9': movenc: write avg_frame_rate as the framerate, not the codec timebase

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

(No files)