Changeset b71e4d87 in ffmpeg

Timestamp:

Nov 14, 2013, 12:14:41 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d67d3e29

Parents:

31c09b76 (diff), 8941971a (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.

Message:

Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'

• commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65': lavc: make error_rate a private option of mpegvideo encoders

Conflicts:

libavcodec/options_table.h
libavcodec/version.h

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

(No files)