Changeset 8334850a in ffmpeg

Timestamp:

May 18, 2014, 12:38:36 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b06741d2

Parents:

8636b11b (diff), 93afb6c9 (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/18/14 12:30:43)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/18/14 12:38:36)

Message:

Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'

• commit '93afb6c98df876b15e3d911a9450ad55f92080ce': avconv: set output avg_frame_rate when known

Conflicts:

ffmpeg.c

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

(No files)