From 47ede93af009e3c8abca39b455785f3f02b8f8f4 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 3 Mar 2016 21:15:48 -0500 Subject: [PATCH] Update common submodule --- moonlight-common-c | 2 +- moonlight.hpp | 2 +- viddec.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/moonlight-common-c b/moonlight-common-c index fbd58c6..c44cdff 160000 --- a/moonlight-common-c +++ b/moonlight-common-c @@ -1 +1 @@ -Subproject commit fbd58c60ea12d8760bae86b7d98b2d0208418baf +Subproject commit c44cdffdd56ff7167b993fdbd21c02592b28879b diff --git a/moonlight.hpp b/moonlight.hpp index 1228746..4b2c62e 100644 --- a/moonlight.hpp +++ b/moonlight.hpp @@ -100,7 +100,7 @@ class MoonlightInstance : public pp::Instance, public pp::MouseLock { void PaintPicture(void); void InitializeRenderingSurface(int width, int height); - static void VidDecSetup(int width, int height, int redrawRate, void* context, int drFlags); + static void VidDecSetup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags); static void VidDecCleanup(void); static int VidDecSubmitDecodeUnit(PDECODE_UNIT decodeUnit); diff --git a/viddec.cpp b/viddec.cpp index 39c2168..5e95182 100644 --- a/viddec.cpp +++ b/viddec.cpp @@ -127,7 +127,7 @@ void MoonlightInstance::InitializeRenderingSurface(int width, int height) { g_Instance->m_Graphics3D.SwapBuffers(pp::BlockUntilComplete()); } -void MoonlightInstance::VidDecSetup(int width, int height, int redrawRate, void* context, int drFlags) { +void MoonlightInstance::VidDecSetup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) { g_Instance->m_VideoDecoder = new pp::VideoDecoder(g_Instance); s_DecodeBufferLength = INITIAL_DECODE_BUFFER_LEN;