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

Merge pull request #938 from admshao/incompatible-pointer-types

Browse Source 
plugins: Clear warnings about -Wincompatible-pointer-types
This commit is contained in:
Jim
2017-07-01 10:37:32 -07:00
committed by GitHub
parent 8942c18695 cfcb2f4f39
commit cfe77fdaae
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/obs-ffmpeg/obs-ffmpeg-source.c
View File

@@ -337,7 +337,7 @@ static const char *ffmpeg_source_getname(void *unused)
return obs_module_text("FFMpegSource");
}
static bool restart_hotkey(void *data, obs_hotkey_id id,
static void restart_hotkey(void *data, obs_hotkey_id id,
obs_hotkey_t *hotkey, bool pressed)
{
UNUSED_PARAMETER(id);
@@ -347,7 +347,6 @@ static bool restart_hotkey(void *data, obs_hotkey_id id,
struct ffmpeg_source *s = data;
if (obs_source_active(s->source))
ffmpeg_source_start(s);
return true;
}
static void restart_proc(void *data, calldata_t *cd)