Changeset bd148ce0 in ffmpeg

Timestamp:

Jun 18, 2014, 3:27:06 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

95398aa9

Parents:

daa7bcca (diff), cfbdd7ff (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> (06/18/14 15:21:28)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/18/14 15:27:06)

Message:

Merge commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016'

• commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016': rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase

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

(No files)