mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-09-27 05:09:41 +08:00
Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'
* commit '9affa784a0743b95bde135b5acfce2183afc35d8':
vp9 encoder: use a decent default speed setting
Conflicts:
libavcodec/libvpxenc.c
See: 34e32d6464
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: