Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Bolsee <benoit.bolsee@online.be>2015-12-20 14:11:37 +0300
committerBenoit Bolsee <benoit.bolsee@online.be>2015-12-20 14:11:37 +0300
commit18829ee54ae970b3fd2dec74a1d89c24d3085961 (patch)
tree9f3fa22514005f969be41e3586627d359d056ca4 /source/gameengine
parent0ff79c87a440d886cbaed3f2753a7a8cb466ad60 (diff)
Decklink: fix framerate calculation.
For some reason the framerate attribute of the VideoDeclink object was was wrong by 1. framerate now returns the correct value.
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/VideoTexture/VideoDeckLink.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/VideoTexture/VideoDeckLink.cpp b/source/gameengine/VideoTexture/VideoDeckLink.cpp
index b20242e0a5c..85de6e6d10e 100644
--- a/source/gameengine/VideoTexture/VideoDeckLink.cpp
+++ b/source/gameengine/VideoTexture/VideoDeckLink.cpp
@@ -863,7 +863,7 @@ void VideoDeckLink::openCam (char *format, short camIdx)
// for information, in case the application wants to know
m_size[0] = mFrameWidth;
m_size[1] = mTextureDesc.height;
- m_frameRate = 1.0f+(float)frameTimescale / (float)frameDuration;
+ m_frameRate = (float)frameTimescale / (float)frameDuration;
switch (mPixelFormat)
{