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