Merge branch 'master' into UI2

This commit is contained in:
Cameron Gutman 2016-02-16 12:33:49 -05:00
commit f96bd0546f

View File

@ -119,7 +119,7 @@ void MoonlightInstance::VidDecSetup(int width, int height, int redrawRate, void*
g_Instance->m_VideoDecoder->Initialize(g_Instance->m_Graphics3D,
PP_VIDEOPROFILE_H264HIGH,
PP_HARDWAREACCELERATION_ONLY,
PP_HARDWAREACCELERATION_WITHFALLBACK,
0,
pp::BlockUntilComplete());