Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'
* commit '9affa784a0743b95bde135b5acfce2183afc35d8': vp9 encoder: use a decent default speed setting Conflicts: libavcodec/libvpxenc.c See: 34e32d6464135a03da14d5b0aef1d42796939eae Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
cb037b5db4