Commit cb037b5d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '9affa784'

* commit '9affa784':
  vp9 encoder: use a decent default speed setting

Conflicts:
	libavcodec/libvpxenc.c

See: 34e32d64Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3f2f87cd 9affa784
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment