[Bf-blender-cvs] [79e274f] decklink: VideoDecklink: fix compilation warning in Windows.
Benoit Bolsee
noreply at git.blender.org
Mon Jan 11 00:00:11 CET 2016
Commit: 79e274f1f2e563ba63389efcfb5a601004aa1ae4
Author: Benoit Bolsee
Date: Sun Jan 10 23:59:09 2016 +0100
Branches: decklink
https://developer.blender.org/rB79e274f1f2e563ba63389efcfb5a601004aa1ae4
VideoDecklink: fix compilation warning in Windows.
===================================================================
M source/gameengine/VideoTexture/VideoDeckLink.cpp
===================================================================
diff --git a/source/gameengine/VideoTexture/VideoDeckLink.cpp b/source/gameengine/VideoTexture/VideoDeckLink.cpp
index 032145f..dff2fdc 100644
--- a/source/gameengine/VideoTexture/VideoDeckLink.cpp
+++ b/source/gameengine/VideoTexture/VideoDeckLink.cpp
@@ -438,7 +438,7 @@ mBufferCacheSize(cacheSize)
// In case the DLL is not in place, don't fail, just fallback on OpenGL
if (dvpInitGLContext(DVP_DEVICE_FLAGS_SHARE_APP_CONTEXT) != DVP_STATUS_OK)
{
- printf("Warning: Could not initialize DVP context, fallback on OpenGL transfer.\nInstall dvp.dll to take advantage of nVidia GPUDirect.");
+ printf("Warning: Could not initialize DVP context, fallback on OpenGL transfer.\nInstall dvp.dll to take advantage of nVidia GPUDirect.\n");
mHasDvp = false;
}
}
@@ -981,7 +981,7 @@ void VideoDeckLink::openCam (char *format, short camIdx)
THRWEXCP(DeckLinkInternalError, S_OK);
// just in case it is needed to capture from certain cards, we don't check error because we don't need audio
- mDLInput->EnableAudioInput(bmdAudioSampleRate48kHz, 16, 2);
+ mDLInput->EnableAudioInput(bmdAudioSampleRate48kHz, bmdAudioSampleType16bitInteger, 2);
// open base class
VideoBase::openCam(format, camIdx);
More information about the Bf-blender-cvs
mailing list