Changeset fc67d937 in ffmpeg

Timestamp:

Oct 18, 2014, 12:18:41 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c48e8d9d

Parents:

ec8f56ef (diff), 66a68dd (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> (10/18/14 12:17:41)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/18/14 12:18:41)

Message:

Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'

• commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6': lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders

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

(No files)