media fixes for v3.19-rc6