jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-video.c: Fix minor bug 

The pointer here is confusing, so I'm just going to remove it and have
it return the value instead.
master
jp9000 2014-04-19 06:33:11 -07:00
parent d19ba7f624
commit c78fe3e306
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libobs/obs-video.c
View File

@ -20,21 +20,22 @@
#include "graphics/vec4.h"
#include "media-io/format-conversion.h"
static void tick_sources(uint64_t cur_time, uint64_t *last_time)
static uint64_t tick_sources(uint64_t cur_time, uint64_t last_time)
{
size_t i;
uint64_t delta_time;
float seconds;
if (!last_time)
*last_time = cur_time - video_getframetime(obs->video.video);
delta_time = cur_time - *last_time;
last_time = cur_time - video_getframetime(obs->video.video);
delta_time = cur_time - last_time;
seconds = (float)((double)delta_time / 1000000000.0);
for (i = 0; i < obs->data.sources.num; i++)
obs_source_video_tick(obs->data.sources.array[i], seconds);
*last_time = cur_time;
last_time = cur_time;
return last_time;
}
/* in obs-display.c */
@ -416,7 +417,7 @@ void *obs_video_thread(void *param)
while (video_output_wait(obs->video.video)) {
uint64_t cur_time = video_gettime(obs->video.video);
tick_sources(cur_time, &last_time);
last_time = tick_sources(cur_time, last_time);
render_displays();