Merge "Change softvpx buffer count to 10" into pi-dev